Skip to content

Commit 04a3983

Browse files
author
Will Johnston
committed
fixing markdown generation, adding a sql print statement, moding npm link into a task separate from build
1 parent 75af7bf commit 04a3983

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

Gruntfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ module.exports = function (grunt) {
184184

185185
grunt.registerTask('generate', ['prompt:scriptGen', 'generateSchemaFiles']);
186186
grunt.registerTask('configure', ['prompt:database', 'saveDbConfig']);
187-
grunt.registerTask('build', ['shell:tsd', 'typescript', 'file_append', 'shell:link']);
187+
grunt.registerTask('build', ['shell:tsd', 'typescript', 'file_append']);
188+
grunt.registerTask('link', ['shell:link']);
188189
grunt.registerTask('default', ['checkForDbConfig', 'build']);
189190
};

platypus-docs/converters/docmarkdown.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ var linkToMarkup = (content: string, baseURI: string): string => {
3636
// build path using id/kind/name
3737
return `<plat-link plat-options="{ view: '${baseURI}${node.id}/${node.kind}/${node.name_}', isUrl: true }">
3838
${linkValue}
39-
</plat-link>`;
39+
</plat-link>`;
4040
} else {
4141
if (globals.debug) {
4242
console.log(qualifiedPath + ' not found');
4343
}
4444

45-
return value;
45+
return linkValue;
4646
}
4747
} else {
4848
console.log('namehash is empty');
49-
return value;
49+
return linkValue;
5050
}
5151

5252
});

platypus-docs/docsave/db/procedures/base.procedures.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import utils = require('../../../utils/utils');
55
import PromiseStatic = require('es6-promise');
66
import pool = require('../connection');
7+
import mysql = require('mysql');
78

89
var Promise = PromiseStatic.Promise;
910

@@ -22,6 +23,7 @@ class BaseProcedures<T extends INode> {
2223
connection.query(sql, (err: any, response: Array<any>) => {
2324
connection.release();
2425
if (utils.isObject(err)) {
26+
console.log('Error on sql: ' + sql);
2527
return reject(err);
2628
}
2729

platypus-docs/tsd.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"bundle": "./platypus-docs/typings/tsd.d.ts",
77
"installed": {
88
"node/node.d.ts": {
9-
"commit": "bd0833a22eb1c4e4a963068d4e2550fe866399d1"
9+
"commit": "23b6edd28c0f5ccbe9e01bcfc84963d07b921ff7"
1010
},
1111
"mysql/mysql.d.ts": {
12-
"commit": "bd0833a22eb1c4e4a963068d4e2550fe866399d1"
12+
"commit": "23b6edd28c0f5ccbe9e01bcfc84963d07b921ff7"
1313
},
1414
"es6-promise/es6-promise.d.ts": {
15-
"commit": "bd0833a22eb1c4e4a963068d4e2550fe866399d1"
15+
"commit": "23b6edd28c0f5ccbe9e01bcfc84963d07b921ff7"
1616
}
1717
}
1818
}

0 commit comments

Comments
 (0)