lincd-cli 0.2.54 → 0.2.57

package/lib/cli-methods.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
@@ -742,6 +742,14 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
     }
 });
 exports.createComponent = createComponent;
+const checkImports = () => __awaiter(void 0, void 0, void 0, function* () {
+    //read the source of all ts/tsx files in the src folder
+    //if there is an import that imports a lincd package with /src/ in it, then warn
+    //if there is an import that imports outside of the src folder, then warn
+    //TODO: use dependency-cruiser for this
+    //https://github.com/sverweij/dependency-cruiser/blob/HEAD/doc/api.md
+});
+exports.checkImports = checkImports;
 const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
     (0, depcheck_1.default)(process.cwd(), {}, (results) => {
         if (results.missing) {
@@ -1269,8 +1277,6 @@ var buildUpdated = function (back, target, target2, test = false) {
                 if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                     needRebuild = true;
                 }
-                // console.log(pkg.path,lastModifiedSource.lastModifiedTime,lastModifiedBundle.lastModifiedTime);
-                // console.log(pkg.path,new Date(lastModifiedSource.lastModified).toString(),new Date(lastModifiedBundle.lastModified).toString());
                 if (needRebuild || rebuildAllModules) {
                     //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
                     // log(packageName+' modified since last commit on '+now.toString());
@@ -1313,70 +1319,6 @@ var buildUpdated = function (back, target, target2, test = false) {
             }
         });
         return;
-        var p = Promise.resolve('');
-        packages.forEach((pkg) => {
-            let packageName = pkg.packageName;
-            p = p
-                .then((previousResult) => {
-                let lastModifiedSource = getLastModifiedSourceTime(pkg.path);
-                let lastModifiedBundle = getLastBuildTime(pkg.path);
-                // console.log(pkg.path,lastModifiedSource.lastModifiedTime,lastModifiedBundle.lastModifiedTime);
-                // console.log(pkg.path,new Date(lastModifiedSource.lastModified).toString(),new Date(lastModifiedBundle.lastModified).toString());
-                debugInfo('# Checking package ' + packageName);
-                if (lastModifiedSource.lastModifiedTime >
-                    lastModifiedBundle.lastModifiedTime) {
-                    //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
-                    // log(packageName+' modified since last commit on '+now.toString());
-                    debugInfo(chalk_1.default.cyan('Last modified source: ' +
-                        lastModifiedSource.lastModifiedName +
-                        ' on ' +
-                        lastModifiedSource.lastModified.toString()));
-                    debugInfo(chalk_1.default.cyan('Last build: ' +
-                        (lastModifiedBundle &&
-                            typeof lastModifiedBundle.lastModified !== 'undefined'
-                            ? lastModifiedBundle.lastModified.toString()
-                            : 'never')));
-                    if (test) {
-                        debugInfo('need to build ' + packageName);
-                    }
-                    else {
-                        log('building ' + packageName);
-                    }
-                    if (!test) {
-                        return (0, utils_1.execPromise)('cd ' +
-                            pkg.path +
-                            ' && yarn build' +
-                            (target ? ' ' + target : '') +
-                            (target2 ? ' ' + target2 : '')).then((res) => {
-                            if (res.indexOf('Aborted due to warnings') !== -1 ||
-                                res.indexOf('Fatal error') !== -1) {
-                                console.log(res);
-                                return (previousResult + ' ' + chalk_1.default.red(packageName + ' failed\n'));
-                            }
-                            console.log(chalk_1.default.green(packageName + ' successfully built'));
-                            return (previousResult + ' ' + chalk_1.default.green(packageName + ' built\n'));
-                        });
-                    }
-                    return (previousResult +
-                        ' ' +
-                        chalk_1.default.blue(packageName + ' should be build\n'));
-                }
-                return previousResult;
-            })
-                .catch(({ error, stdout, stderr }) => {
-                console.log(stdout);
-                return previousResult + ' ' + chalk_1.default.red(packageName + ' failed\n');
-            });
-        });
-        return p.then((messages) => {
-            if (messages == '') {
-                console.log(chalk_1.default.green('Nothing to rebuild.'));
-            }
-            else {
-                console.log('Summary: \n' + messages);
-            }
-        });
-        // });
     });
 };
 exports.buildUpdated = buildUpdated;
@@ -1385,11 +1327,11 @@ const needsRebuilding = function (pkg, log = false) {
     let lastModifiedBundle = getLastBuildTime(pkg.path);
     let result = lastModifiedSource.lastModifiedTime > lastModifiedBundle.lastModifiedTime;
     if (log) {
-        debugInfo(chalk_1.default.cyan('Last modified source: ' +
+        console.log(chalk_1.default.cyan('Last modified source: ' +
             lastModifiedSource.lastModifiedName +
             ' on ' +
             lastModifiedSource.lastModified.toString()));
-        debugInfo(chalk_1.default.cyan('Last build: ' +
+        console.log(chalk_1.default.cyan('Last build: ' +
             (lastModifiedBundle &&
                 typeof lastModifiedBundle.lastModified !== 'undefined'
                 ? lastModifiedBundle.lastModified.toString()

package/lib/cli.js

@@ -126,6 +126,9 @@ program.command('dev [target] [mode]').action((target, mode) => {
 program.command('depcheck').action((target, mode) => {
     (0, cli_methods_1.depCheck)();
 });
+program.command('check-imports').action((target, mode) => {
+    (0, cli_methods_1.checkImports)();
+});
 program
     .command('package')
     .action((name, command, args) => {

package/lib/config-grunt.js

@@ -87,7 +87,13 @@ function setupGrunt(grunt, moduleName, config) {
         'prepare-build',
         // buildFrontend ? 'webpack:build-es6' : null,
         buildServer
-            ? ['clean:lib', 'exec:build-lib', 'copy:lib', 'exec:depcheck']
+            ? [
+                'clean:lib',
+                'exec:build-lib',
+                'copy:lib',
+                'exec:depcheck',
+                'exec:check-imports',
+            ]
             : null,
         // 'exec:shapes',
     ]));
@@ -114,6 +120,7 @@ function setupGrunt(grunt, moduleName, config) {
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
             depcheck: 'yarn lincd depcheck',
+            'check-imports': 'yarn lincd check-imports',
             test: 'tsc -w',
             // shapes: 'lincd shapes',
             'css-declarations': 'tcm -p **/*.scss',
@@ -149,19 +156,19 @@ function setupGrunt(grunt, moduleName, config) {
         },
         concurrent: {
             dev: (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev' : null,
+                // buildFrontend ? 'webpack:dev' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'
             ]),
             'dev-prod': (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev-prod' : null,
+                // buildFrontend ? 'webpack:dev-prod' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'
             ]),
             'dev-es5': (0, utils_1.flatten)([
-                buildFrontend ? 'webpack:dev-es5' : null,
+                // buildFrontend ? 'webpack:dev-es5' : null,
                 buildServer ? 'exec:server-dev' : null,
                 // buildServer ? 'watch:css-module-transforms' : null,
                 // 'exec:css-declarations-watch'

package/lib/plugins/check-imports.js

@@ -34,15 +34,15 @@ function handler(source) {
     //save as userRequest?
     let resource = this._module.resource;
     let relativePath = this._module.resourceResolveData.relativePath;
-    // console.log('-----');
+    console.log('-----');
     // for (let key in this) {
     //   console.log(key, this[key]);
     // }
     let isRelativeReq = request.indexOf('./') === 0 || request.indexOf('../') === 0;
     // if (isRelativeReq) {
-    // console.log('rootContext', rootContext);
-    // console.log('context', context);
-    // console.log('request', request);
+    console.log('rootContext', rootContext);
+    console.log('context', context);
+    console.log('request', request);
     // // console.log('userRequest', userRequest);
     // // console.log('resource', resource);
     // console.log('relativePath', relativePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.54",
+  "version": "0.2.57",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {