strictr 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/check.d.ts +2 -1
- package/lib/check.js +5 -5
- package/lib/check.js.map +1 -1
- package/lib/functions/add.use.strict.d.ts +1 -1
- package/lib/functions/add.use.strict.js +1 -1
- package/lib/functions/add.use.strict.js.map +1 -1
- package/lib/functions/bail.d.ts +1 -1
- package/lib/functions/bail.js.map +1 -1
- package/lib/functions/check.folder.d.ts +1 -1
- package/lib/functions/check.folder.js.map +1 -1
- package/lib/functions/convert.files.to.objects.d.ts +1 -1
- package/lib/functions/convert.files.to.objects.js +1 -1
- package/lib/functions/convert.files.to.objects.js.map +1 -1
- package/lib/functions/fix.extension.d.ts +1 -1
- package/lib/functions/fix.extension.js.map +1 -1
- package/lib/functions/get.config.d.ts +1 -1
- package/lib/functions/get.config.js +9 -7
- package/lib/functions/get.config.js.map +1 -1
- package/lib/functions/get.files.listing.d.ts +1 -1
- package/lib/functions/get.files.listing.js.map +1 -1
- package/lib/functions/get.table.from.file.objects.d.ts +1 -2
- package/lib/functions/get.table.from.file.objects.js +2 -2
- package/lib/functions/get.table.from.file.objects.js.map +1 -1
- package/lib/functions/missing.strict.statement.js.map +1 -1
- package/lib/strictr.js +1 -1
- package/lib/strictr.js.map +1 -1
- package/lib/types.d.ts +22 -0
- package/lib/types.js +4 -0
- package/lib/types.js.map +1 -0
- package/package.json +21 -47
package/lib/check.d.ts
CHANGED
package/lib/check.js
CHANGED
|
@@ -49,28 +49,28 @@ const missing_strict_statement_1 = __importDefault(require("./functions/missing.
|
|
|
49
49
|
const get_table_from_file_objects_1 = __importDefault(require("./functions/get.table.from.file.objects"));
|
|
50
50
|
const clc = require('cli-color');
|
|
51
51
|
exports.default = {
|
|
52
|
-
run(commander) {
|
|
52
|
+
run: (commander) => {
|
|
53
53
|
console.log(clc.blue.bgGreen.bold('\n*** STRICTR ***'));
|
|
54
54
|
const options = _.pick(commander, ['config', 'add']);
|
|
55
55
|
const { add = false } = options;
|
|
56
56
|
const root = process.cwd();
|
|
57
|
-
const config = (0, get_config_1.default)(root, options === null || options === void 0 ? void 0 : options.config);
|
|
57
|
+
const config = (0, get_config_1.default)(root, (options === null || options === void 0 ? void 0 : options.config) || '.strictr.json');
|
|
58
58
|
const { srcFolderName, testFolderName } = config;
|
|
59
|
-
|
|
59
|
+
const { filesExtension } = config;
|
|
60
60
|
const srcFolder = path.join(root, srcFolderName);
|
|
61
61
|
(0, check_folder_1.default)(srcFolder, 'Source');
|
|
62
62
|
const testFolder = path.join(root, testFolderName);
|
|
63
63
|
(0, check_folder_1.default)(testFolder, 'Test');
|
|
64
64
|
let srcFiles = (0, get_files_listing_1.default)(srcFolder, filesExtension);
|
|
65
65
|
let testFiles = (0, get_files_listing_1.default)(testFolder, filesExtension);
|
|
66
|
-
srcFiles =
|
|
66
|
+
srcFiles = srcFiles.filter(missing_strict_statement_1.default);
|
|
67
67
|
if (!_.isEmpty(srcFiles)) {
|
|
68
68
|
console.log(clc.red('\nStrictr: Source files missing the ' + clc.italic("'use strict';") + ' statement:'));
|
|
69
69
|
console.log(clc.red((0, get_table_from_file_objects_1.default)((0, convert_files_to_objects_1.default)(srcFiles)).toString()));
|
|
70
70
|
}
|
|
71
71
|
else
|
|
72
72
|
console.log(clc.green('\n✅ Strictr: No source files are missing the ' + clc.italic("'use strict';") + ' statement.'));
|
|
73
|
-
testFiles =
|
|
73
|
+
testFiles = testFiles.filter(missing_strict_statement_1.default);
|
|
74
74
|
if (!_.isEmpty(testFiles)) {
|
|
75
75
|
console.log(clc.red('\nStrictr: Test files missing the ' + clc.italic("'use strict';") + ' statement:'));
|
|
76
76
|
console.log(clc.red((0, get_table_from_file_objects_1.default)((0, convert_files_to_objects_1.default)(testFiles)).toString()));
|
package/lib/check.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,2CAA6B;AAE7B,0CAA4B;AAE5B,4DAAoC;AACpC,wEAA+C;AAC/C,4EAAmD;AACnD,gFAAsD;AACtD,sFAA4D;AAC5D,oGAAyE;AACzE,oGAA0E;AAC1E,0GAA8E;
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ const addUseStrict = (path) => {
|
|
|
42
42
|
return console.log(clc.red('\nStrictr ERROR: ' + clc.bold(`${path}`) + ' does not exist.'));
|
|
43
43
|
const content = fs.readFileSync(path, 'utf-8');
|
|
44
44
|
let lines = (0, lodash_1.split)((0, lodash_1.trim)(content), '\n');
|
|
45
|
-
const one = (0, lodash_1.trim)((0, lodash_1.first)(lines));
|
|
45
|
+
const one = (0, lodash_1.trim)((0, lodash_1.first)(lines) || '');
|
|
46
46
|
const hasBang = (0, lodash_1.startsWith)(one, '#!/');
|
|
47
47
|
let allButFirst = hasBang
|
|
48
48
|
? (0, lodash_1.tail)(lines)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.use.strict.js","sourceRoot":"","sources":["../../src/functions/add.use.strict.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,mCAAkE;AAElE,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEjC,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"add.use.strict.js","sourceRoot":"","sources":["../../src/functions/add.use.strict.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,mCAAkE;AAElE,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEjC,MAAM,YAAY,GAAa,CAAC,IAAY,EAAQ,EAAE;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC;IAEtH,MAAM,OAAO,GAAW,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,KAAK,GAAa,IAAA,cAAK,EAAC,IAAA,aAAI,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAEjD,MAAM,GAAG,GAAW,IAAA,aAAI,EAAC,IAAA,cAAK,EAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAY,IAAA,mBAAU,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEhD,IAAI,WAAW,GAAa,OAAO;QAClC,CAAC,CAAC,IAAA,aAAI,EAAC,KAAK,CAAC;QACb,CAAC,CAAC,KAAK,CAAC;IACT,WAAW,GAAG,IAAA,cAAK,EAAC,IAAA,aAAI,EAAC,IAAA,aAAI,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACzD,KAAK,GAAG,CAAC,eAAe,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC,CAAC;IAE9C,KAAK,GAAG,OAAO;QACd,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACjB,CAAC,CAAC,KAAK,CAAC;IAET,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAA,aAAI,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;AAC5G,CAAC,CAAC;AACF,kBAAe,YAAY,CAAC"}
|
package/lib/functions/bail.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bail.js","sourceRoot":"","sources":["../../src/functions/bail.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;AAEb,MAAM,EAAC,IAAI,EAAC,
|
|
1
|
+
{"version":3,"file":"bail.js","sourceRoot":"","sources":["../../src/functions/bail.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;AAEb,MAAM,EAAC,IAAI,EAAC,GAAoC,OAAO,CAAC,cAAc,CAAC,CAAC;AAExE,MAAM,IAAI,GAAa,CAAC,OAAgB,EAAQ,EAAE;IACjD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvB,IAAI,CAAC,CAAC,CAAC,CAAC;AACT,CAAC,CAAC;AACF,kBAAe,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.folder.js","sourceRoot":"","sources":["../../src/functions/check.folder.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,kDAA0B;AAE1B,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEjC,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"check.folder.js","sourceRoot":"","sources":["../../src/functions/check.folder.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,kDAA0B;AAE1B,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEjC,MAAM,WAAW,GAAa,CAAC,MAAc,EAAE,IAAY,EAAQ,EAAE;IACpE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,CAAC,YAAY,IAAI,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACzC,IAAA,cAAI,EAAC,GAAG,CAAC,GAAG,CAAC,YAAY,IAAI,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -41,7 +41,7 @@ const convertFilesToObjects = (files) => {
|
|
|
41
41
|
const separator = 'win32' === platform ? '\\' : '/';
|
|
42
42
|
return _.map(files, (f) => {
|
|
43
43
|
const parts = _.split(f, separator);
|
|
44
|
-
const name = parts.pop();
|
|
44
|
+
const name = parts.pop() || '';
|
|
45
45
|
const path = _.join(parts, separator);
|
|
46
46
|
const full = path + separator + name;
|
|
47
47
|
return { name, path, full };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.files.to.objects.js","sourceRoot":"","sources":["../../src/functions/convert.files.to.objects.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,4CAA8B;AAE9B,0CAA4B;
|
|
1
|
+
{"version":3,"file":"convert.files.to.objects.js","sourceRoot":"","sources":["../../src/functions/convert.files.to.objects.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,4CAA8B;AAE9B,0CAA4B;AAG5B,MAAM,qBAAqB,GAAa,CAAC,KAAe,EAAgB,EAAE;IACzE,MAAM,QAAQ,GAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;IACvC,MAAM,SAAS,GAAW,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IAE5D,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAS,EAAc,EAAE;QAC7C,MAAM,KAAK,GAAa,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAW,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QACvC,MAAM,IAAI,GAAW,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAW,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;QAC7C,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.extension.js","sourceRoot":"","sources":["../../src/functions/fix.extension.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;AAEb,mCAA2C;AAE3C,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"fix.extension.js","sourceRoot":"","sources":["../../src/functions/fix.extension.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;AAEb,mCAA2C;AAE3C,MAAM,YAAY,GAAa,CAAC,GAAW,EAAU,EAAE;IACtD,IAAI,CAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,GAAG,CAAC;QAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IAC3C,OAAO,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}
|
|
@@ -41,36 +41,37 @@ const fs = __importStar(require("fs"));
|
|
|
41
41
|
const path_1 = __importDefault(require("path"));
|
|
42
42
|
const lodash_1 = require("lodash");
|
|
43
43
|
const fix_extension_1 = __importDefault(require("./fix.extension"));
|
|
44
|
-
const
|
|
44
|
+
const hasJS = (srcFolder) => {
|
|
45
45
|
const files = fs.readdirSync(srcFolder);
|
|
46
|
-
const
|
|
46
|
+
const foundJS = (0, lodash_1.find)(files, (file) => {
|
|
47
47
|
const ext = path_1.default.extname(file);
|
|
48
48
|
return ext === '.js';
|
|
49
49
|
});
|
|
50
|
-
return !!
|
|
50
|
+
return !!foundJS;
|
|
51
51
|
};
|
|
52
|
-
const
|
|
52
|
+
const getDefaultConfig = (root) => {
|
|
53
53
|
const defaultConfig = {
|
|
54
54
|
srcFolderName: 'src',
|
|
55
55
|
testFolderName: 'test',
|
|
56
56
|
filesExtension: '.ts'
|
|
57
57
|
};
|
|
58
58
|
try {
|
|
59
|
-
|
|
59
|
+
const config = (0, lodash_1.cloneDeep)(defaultConfig);
|
|
60
60
|
const srcFolder = path_1.default.join(root, 'src');
|
|
61
61
|
if (fs.lstatSync(srcFolder).isDirectory()) {
|
|
62
|
-
if (
|
|
62
|
+
if (hasJS(srcFolder)) {
|
|
63
63
|
(0, lodash_1.set)(config, 'filesExtension', '.js');
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
return config;
|
|
67
67
|
}
|
|
68
68
|
catch (error) {
|
|
69
|
+
console.error(error);
|
|
69
70
|
return defaultConfig;
|
|
70
71
|
}
|
|
71
72
|
};
|
|
72
73
|
const getConfig = (root, configFile) => {
|
|
73
|
-
const defaultConfig =
|
|
74
|
+
const defaultConfig = getDefaultConfig(root);
|
|
74
75
|
try {
|
|
75
76
|
const userConfig = require(path_1.default.join(root, configFile));
|
|
76
77
|
const config = Object.assign(Object.assign({}, defaultConfig), userConfig);
|
|
@@ -78,6 +79,7 @@ const getConfig = (root, configFile) => {
|
|
|
78
79
|
return config;
|
|
79
80
|
}
|
|
80
81
|
catch (error) {
|
|
82
|
+
console.error(error);
|
|
81
83
|
return defaultConfig;
|
|
82
84
|
}
|
|
83
85
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.config.js","sourceRoot":"","sources":["../../src/functions/get.config.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,gDAAwB;AAExB,mCAA4C;AAC5C,oEAA2C;
|
|
1
|
+
{"version":3,"file":"get.config.js","sourceRoot":"","sources":["../../src/functions/get.config.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,gDAAwB;AAExB,mCAA4C;AAC5C,oEAA2C;AAG3C,MAAM,KAAK,GAAa,CAAC,SAAiB,EAAW,EAAE;IACtD,MAAM,KAAK,GAAa,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,OAAO,GAAuB,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,IAAY,EAAW,EAAE;QACzE,MAAM,GAAG,GAAW,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,GAAG,KAAK,KAAK,CAAC;IACtB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,CAAC,OAAO,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAa,CAAC,IAAY,EAAU,EAAE;IAC3D,MAAM,aAAa,GAAW;QAC7B,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,MAAM;QACtB,cAAc,EAAE,KAAK;KACrB,CAAC;IAEF,IAAI,CAAC;QACJ,MAAM,MAAM,GAAW,IAAA,kBAAS,EAAC,aAAa,CAAC,CAAC;QAEhD,MAAM,SAAS,GAAW,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YAC3C,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtB,IAAA,YAAG,EAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;QACF,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,aAAa,CAAC;IACtB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,SAAS,GAAa,CAAC,IAAY,EAAE,UAAkB,EAAU,EAAE;IACxE,MAAM,aAAa,GAAW,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,CAAC;QACJ,MAAM,UAAU,GAAoB,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QAEzE,MAAM,MAAM,mCAAe,aAAa,GAAK,UAAU,CAAC,CAAC;QACzD,IAAA,YAAG,EAAC,MAAM,EAAE,gBAAgB,EAAE,IAAA,uBAAY,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAEnE,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,aAAa,CAAC;IACtB,CAAC;AACF,CAAC,CAAC;AACF,kBAAe,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.files.listing.js","sourceRoot":"","sources":["../../src/functions/get.files.listing.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,2CAA6B;AAC7B,0CAA4B;AAE5B,oEAA2C;AAE3C,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"get.files.listing.js","sourceRoot":"","sources":["../../src/functions/get.files.listing.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AACzB,2CAA6B;AAC7B,0CAA4B;AAE5B,oEAA2C;AAE3C,MAAM,eAAe,GAAa,CAAC,IAAY,EAAE,GAAW,EAAY,EAAE;IACzE,GAAG,GAAG,IAAA,uBAAY,EAAC,GAAG,CAAC,CAAC;IAExB,IAAI,KAAK,GAAa,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAa,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEhD,MAAM,QAAQ,GAAa,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACtH,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAE;QACjC,MAAM,OAAO,GAAW,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAa,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACvH,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,MAAc,EAAE,EAAE;QACrC,MAAM,cAAc,GAAW,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvD,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
|
|
@@ -40,12 +40,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
40
40
|
const _ = __importStar(require("lodash"));
|
|
41
41
|
const cli_table_1 = __importDefault(require("cli-table"));
|
|
42
42
|
const getTableFromFileObjects = (objects, includeNewPath) => {
|
|
43
|
-
|
|
43
|
+
const columns = ['#', 'File', 'Path'];
|
|
44
44
|
if (includeNewPath)
|
|
45
45
|
columns.push('New Path');
|
|
46
46
|
const table = new cli_table_1.default({ style: { head: ['black'], compact: true }, head: columns });
|
|
47
47
|
let id = 0;
|
|
48
|
-
_.each(objects, (o) => table.push([++id, ..._.values(_.omit(o, ['full']))]));
|
|
48
|
+
_.each(objects, (o) => table.push([String(++id), ..._.values(_.omit(o, ['full']))]));
|
|
49
49
|
return table;
|
|
50
50
|
};
|
|
51
51
|
exports.default = getTableFromFileObjects;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.table.from.file.objects.js","sourceRoot":"","sources":["../../src/functions/get.table.from.file.objects.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,0CAA4B;AAC5B,0DAA8B;
|
|
1
|
+
{"version":3,"file":"get.table.from.file.objects.js","sourceRoot":"","sources":["../../src/functions/get.table.from.file.objects.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,0CAA4B;AAC5B,0DAA8B;AAG9B,MAAM,uBAAuB,GAAa,CAAC,OAAqB,EAAE,cAAwB,EAAS,EAAE;IACpG,MAAM,OAAO,GAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,cAAc;QAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAU,IAAI,mBAAK,CAAC,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAC,EAAE,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC;IACzF,IAAI,EAAE,GAAW,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjG,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,uBAAuB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"missing.strict.statement.js","sourceRoot":"","sources":["../../src/functions/missing.strict.statement.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AAEzB,mCAAwD;AAExD,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"missing.strict.statement.js","sourceRoot":"","sources":["../../src/functions/missing.strict.statement.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,uCAAyB;AAEzB,mCAAwD;AAExD,MAAM,sBAAsB,GAA8B,CAAC,IAAY,EAAW,EAAE;IACnF,MAAM,OAAO,GAAW,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvD,IAAI,KAAK,GAAa,IAAA,cAAK,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3C,KAAK,GAAG,IAAA,YAAG,EAAC,KAAK,EAAE,aAAI,CAAC,CAAC;IAEzB,OAAO,CAAC,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;AACrE,CAAC,CAAC;AACF,kBAAe,sBAAsB,CAAC"}
|
package/lib/strictr.js
CHANGED
|
@@ -11,7 +11,7 @@ const packageJson = require('../package.json');
|
|
|
11
11
|
commander
|
|
12
12
|
.version(packageJson.version)
|
|
13
13
|
.description('Check for missing strict statement in files.\nUse .strictr.json config file to override default settings.')
|
|
14
|
-
.option('-
|
|
14
|
+
.option('-f, --fix', 'Fix missing strict statements', false)
|
|
15
15
|
.option('-c, --config <config>', 'Alternative config file (must be .json)', '.strictr.json')
|
|
16
16
|
.parse(process.argv);
|
|
17
17
|
const options = commander.opts();
|
package/lib/strictr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strictr.js","sourceRoot":"","sources":["../src/strictr.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;AAab,yCAAkC;AAClC,oDAA4B;
|
|
1
|
+
{"version":3,"file":"strictr.js","sourceRoot":"","sources":["../src/strictr.ts"],"names":[],"mappings":";AACA,YAAY,CAAC;;;;;AAab,yCAAkC;AAClC,oDAA4B;AAG5B,MAAM,SAAS,GAAY,IAAI,mBAAO,EAAE,CAAC;AACzC,MAAM,WAAW,GAAgB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE5D,SAAS;KACP,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,WAAW,CAAC,2GAA2G,CAAC;KACxH,MAAM,CAAC,WAAW,EAAE,+BAA+B,EAAE,KAAK,CAAC;KAC3D,MAAM,CAAC,uBAAuB,EAAE,yCAAyC,EAAE,eAAe,CAAC;KAC3F,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtB,MAAM,OAAO,GAAqB,SAAS,CAAC,IAAI,EAAE,CAAC;AACnD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC"}
|
package/lib/types.d.ts
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
export interface Config {
|
|
3
|
+
srcFolderName: string;
|
|
4
|
+
testFolderName: string;
|
|
5
|
+
filesExtension: string;
|
|
6
|
+
}
|
|
7
|
+
export interface FileObject {
|
|
8
|
+
name: string;
|
|
9
|
+
path: string;
|
|
10
|
+
full: string;
|
|
11
|
+
}
|
|
12
|
+
export interface CommanderOptions {
|
|
13
|
+
config?: string;
|
|
14
|
+
fix?: boolean;
|
|
15
|
+
add?: boolean;
|
|
16
|
+
}
|
|
17
|
+
export interface PackageJson {
|
|
18
|
+
name: string;
|
|
19
|
+
version: string;
|
|
20
|
+
description: string;
|
|
21
|
+
[key: string]: any;
|
|
22
|
+
}
|
package/lib/types.js
ADDED
package/lib/types.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AACA,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "strictr",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "strict statement checker",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.12.1"
|
|
@@ -22,13 +22,14 @@
|
|
|
22
22
|
"all": "pnpm i & pnpm dedupe & pnpm audit --fix & tsc & pnpm clean & pnpm format & pnpm build & pnpm test & pnpm docs",
|
|
23
23
|
"build": "del /S /Q lib\\* && tsc",
|
|
24
24
|
"build:watch": "tsc --watch",
|
|
25
|
-
"lint": "
|
|
25
|
+
"lint": "eslint src/**/*.ts test/**/*.ts",
|
|
26
|
+
"lint:fix": "eslint src/**/*.ts test/**/*.ts --fix",
|
|
26
27
|
"docs": "typedoc --readme none --out docs src",
|
|
27
|
-
"test": "
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
31
|
-
"format": "prettier --write \"src/**/*.ts\"",
|
|
28
|
+
"test": "jest --coverage --config jest.config.js",
|
|
29
|
+
"test:watch": "jest --watch",
|
|
30
|
+
"test:coverage": "jest --coverage",
|
|
31
|
+
"clean": "eslint src/**/*.ts test/**/*.ts --fix",
|
|
32
|
+
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
|
32
33
|
"up": "pnpm up -i",
|
|
33
34
|
"upgrade": "pnpm up",
|
|
34
35
|
"latest": "pnpm up -i -L",
|
|
@@ -43,53 +44,26 @@
|
|
|
43
44
|
"lodash": "^4.17.21"
|
|
44
45
|
},
|
|
45
46
|
"devDependencies": {
|
|
46
|
-
"@types/
|
|
47
|
-
"@types/lodash": "^4.17.
|
|
48
|
-
"@types/
|
|
49
|
-
"@
|
|
50
|
-
"
|
|
51
|
-
"
|
|
52
|
-
"
|
|
47
|
+
"@types/jest": "^30.0.0",
|
|
48
|
+
"@types/lodash": "^4.17.20",
|
|
49
|
+
"@types/node": "^24.0.13",
|
|
50
|
+
"@typescript-eslint/eslint-plugin": "^8.36.0",
|
|
51
|
+
"@typescript-eslint/parser": "^8.36.0",
|
|
52
|
+
"eslint": "^9.30.1",
|
|
53
|
+
"eslint-config-prettier": "^10.1.5",
|
|
54
|
+
"eslint-plugin-jest": "^29.0.1",
|
|
55
|
+
"eslint-plugin-prettier": "^5.1.3",
|
|
56
|
+
"jest": "^30.0.4",
|
|
53
57
|
"prettier": "^3.6.2",
|
|
54
58
|
"source-map-support": "^0.5.21",
|
|
59
|
+
"ts-jest": "^29.2.5",
|
|
55
60
|
"ts-node": "^10.9.2",
|
|
56
|
-
"tslint": "^6.1.3",
|
|
57
|
-
"tslint-config-prettier": "^1.18.0",
|
|
58
|
-
"tslint-etc": "^1.13.10",
|
|
59
|
-
"tslint-no-unused-expression-chai": "^0.1.4",
|
|
60
61
|
"typedoc": "^0.28.7",
|
|
61
62
|
"typescript": "^5.8.3"
|
|
62
63
|
},
|
|
63
|
-
"nyc": {
|
|
64
|
-
"include": [
|
|
65
|
-
"src/**/*.ts"
|
|
66
|
-
],
|
|
67
|
-
"exclude": [
|
|
68
|
-
"test/**/*.ts"
|
|
69
|
-
],
|
|
70
|
-
"extension": [
|
|
71
|
-
".ts"
|
|
72
|
-
],
|
|
73
|
-
"require": [
|
|
74
|
-
"ts-node/register"
|
|
75
|
-
],
|
|
76
|
-
"reporter": [
|
|
77
|
-
"text-summary",
|
|
78
|
-
"html"
|
|
79
|
-
],
|
|
80
|
-
"sourceMap": true,
|
|
81
|
-
"instrument": true
|
|
82
|
-
},
|
|
83
64
|
"pnpm": {
|
|
84
|
-
"allowedDeprecatedVersions": {
|
|
85
|
-
"tslint": "6.1.3"
|
|
86
|
-
},
|
|
87
65
|
"updateConfig": {
|
|
88
|
-
"ignoreDependencies": [
|
|
89
|
-
"chai",
|
|
90
|
-
"@types/chai",
|
|
91
|
-
"tslint"
|
|
92
|
-
]
|
|
66
|
+
"ignoreDependencies": []
|
|
93
67
|
},
|
|
94
68
|
"onlyBuiltDependencies": [
|
|
95
69
|
"es5-ext"
|
|
@@ -99,5 +73,5 @@
|
|
|
99
73
|
"brace-expansion@>=1.0.0 <=1.1.11": ">=1.1.12"
|
|
100
74
|
}
|
|
101
75
|
},
|
|
102
|
-
"packageManager": "pnpm@10.
|
|
76
|
+
"packageManager": "pnpm@10.13.1"
|
|
103
77
|
}
|