lincd-cli 0.2.7 → 0.2.8

package/lib/cli.js

@@ -116,7 +116,7 @@ program
 })
     .description('Creates a new ontology file for your package. Execute this from your package folder.')
     .argument('<suggested-prefix>', 'The suggested prefix for your ontology. Also the shorthand code used for the file name and the exported ontology object')
-    .argument('[uribase]', "Optional argument to set the URI base for the URI's of all entities in your ontology. Leave blank to use the URI's provided by lincd.org once you register this package");
+    .argument('[uribase]', 'Optional argument to set the URI base for the URI\'s of all entities in your ontology. Leave blank to use the URI\'s provided by lincd.org once you register this package');
 program.command('register-local', { hidden: true }).action(function () {
     register('http://localhost:4101');
 });
@@ -136,7 +136,7 @@ program
     console.log(ownPackage.version);
     console.log('Running from: ' + __dirname);
 })
-    .description("Log the version of this tool and the path that it's running from");
+    .description('Log the version of this tool and the path that it\'s running from');
 program.command('build [target] [target2]', { isDefault: true }).action(function (target, target2) {
     buildPackage(target, target2);
 });
@@ -225,12 +225,11 @@ function debugInfo() {
     //   console.log(gruntConfig);
     //   process.exit();
     // }
-    // if(gruntConfig.analyse === true)
-    // {
-    //   messages.forEach((message) => {
-    //     console.log(chalk.cyan('Info: ') + message);
-    //   });
-    // }
+    if (gruntConfig && gruntConfig.analyse === true) {
+        messages.forEach(function (message) {
+            console.log(chalk.cyan('Info: ') + message);
+        });
+    }
 }
 function warn() {
     var messages = [];
@@ -705,7 +704,7 @@ var createOntology = function (prefix, uriBase, basePath) {
                     setVariable('uri_base', uriBase);
                     _a = setNameVariables(prefix), hyphenName = _a.hyphenName, camelCaseName = _a.camelCaseName, underscoreName = _a.underscoreName;
                     //copy ontology accessor file
-                    log("Creating files for ontology '" + prefix + "'");
+                    log('Creating files for ontology \'' + prefix + '\'');
                     targetFile = path.join(targetFolder, hyphenName + '.ts');
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
                     targetDataFile = path.join(targetFolder, '..', 'data', hyphenName + '.json');
@@ -829,7 +828,7 @@ var createShape = function (name, basePath) {
                     targetFolder = ensureFolderExists(basePath, 'src', 'shapes');
                     _a = setNameVariables(name), hyphenName = _a.hyphenName, camelCaseName = _a.camelCaseName, underscoreName = _a.underscoreName;
                     //copy default shape file
-                    log("Creating files for shape '" + name + "'");
+                    log('Creating files for shape \'' + name + '\'');
                     targetFile = path.join(targetFolder, hyphenName + '.ts');
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'shape.ts'), targetFile);
                     //replace variables in some of the copied files
@@ -854,7 +853,7 @@ var createSetComponent = function (name, basePath) {
                     targetFolder = ensureFolderExists(basePath, 'src', 'components');
                     _a = setNameVariables(name), hyphenName = _a.hyphenName, camelCaseName = _a.camelCaseName, underscoreName = _a.underscoreName;
                     //copy default shape file
-                    log("Creating files for set component '" + name + "'");
+                    log('Creating files for set component \'' + name + '\'');
                     targetFile = path.join(targetFolder, hyphenName + '.tsx');
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'set-component.tsx'), targetFile);
                     targetFile2 = path.join(targetFolder, hyphenName + '.scss');
@@ -881,7 +880,7 @@ var createComponent = function (name, basePath) {
                     targetFolder = ensureFolderExists(basePath, 'src', 'components');
                     _a = setNameVariables(name), hyphenName = _a.hyphenName, camelCaseName = _a.camelCaseName, underscoreName = _a.underscoreName;
                     //copy default shape file
-                    log("Creating files for component '" + name + "'");
+                    log('Creating files for component \'' + name + '\'');
                     targetFile = path.join(targetFolder, hyphenName + '.tsx');
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'component.tsx'), targetFile);
                     targetFile2 = path.join(targetFolder, hyphenName + '.scss');
@@ -930,7 +929,7 @@ var createPackage = function (name, uriBase, basePath) {
                     //extra variable for clarity (will be same as 'name')
                     setVariable('output_file_name', name);
                     _b = setNameVariables(cleanPackageName), hyphenName = _b.hyphenName, camelCaseName = _b.camelCaseName, underscoreName = _b.underscoreName;
-                    log("Creating new LINCD package '" + name + "'");
+                    log('Creating new LINCD package \'' + name + '\'');
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'package'), targetFolder);
                     //replace variables in some of the copied files
                     return [4 /*yield*/, Promise.all([
@@ -998,7 +997,7 @@ var createApp = function (name, basePath) {
                     fs.copySync(path.join(__dirname, '..', 'defaults', 'app-with-backend'), targetFolder);
                     fs.renameSync(path.join(targetFolder, '.yarnrc.yml.template'), path.join(targetFolder, '.yarnrc.yml'));
                     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
-                    log("Creating new LINCD application '" + name + "'");
+                    log('Creating new LINCD application \'' + name + '\'');
                     //replace variables in some copied files
                     replaceVariablesInFilesWithRoot(targetFolder, 'package.json', 'frontend/src/App.tsx', 'frontend/src/App.scss.json', 'frontend/src/components/Spinner.scss.json');
                     return [4 /*yield*/, hasYarnInstalled()];
@@ -1127,7 +1126,7 @@ var buildPackage = function (target, target2, packagePath, logResults) {
                 nodeEnv = 'SET NODE_ENV=production&& ';
             }
             else {
-                nodeEnv = "NODE_ENV='production' ";
+                nodeEnv = 'NODE_ENV=\'production\' ';
             }
         }
         if (!target) {
@@ -1201,11 +1200,13 @@ var publishUpdated = function (test) {
     var browserCoreBuilt = false;
     var p = Promise.resolve('');
     var packagesLeft = packages.length;
-    console.log('Checking which packages need to be published by comparing last published date with last git commit');
+    var results = [];
+    log('Checking which packages need to be published by comparing last published date with last git commit');
+    // p = Promise.all(packages.map((pckg) => {
     packages.forEach(function (pckg) {
         p = p.then(function (previousResult) {
-            progressUpdate(packagesLeft-- + ' packages left. Now checking ' + pckg.packageName);
-            debugInfo('# Checking package ' + pckg.packageName);
+            // progressUpdate(packagesLeft-- + ' packages left. Now checking ' + pckg.packageName);
+            // log('# Checking package ' + pckg.packageName);
             // log('# Requesting ' + 'yarn info '+pkg.packageName+' --json');
             // return execPromise('yarn info '+pkg.packageName+' --json').then((output:string) => {
             // console.log("Will be requesting npm view from this current working directory:\n"+process.cwd());
@@ -1216,36 +1217,32 @@ var publishUpdated = function (test) {
             if (pack.private) {
                 shouldPublish = false;
                 debugInfo(chalk.blue('--> is private, skipping'));
-                return previousResult + ' ' + chalk.gray(pckg.packageName + ' is private\n');
+                return chalk.gray(pckg.packageName + ' is private');
+                // return previousResult + ' ' + chalk.gray(pckg.packageName + ' is private\n');
             }
-            return execPromise('yarn info ' + pckg.packageName + ' --json')
+            return execPromise('npm info ' + pckg.packageName + ' --json')
                 .then(function (output) { return __awaiter(_this, void 0, void 0, function () {
-                var info, lastPublish, lastPublishDate, lastCommit, res, browserModule;
+                var info, lastPublish, lastPublishDate, lastCommit, err_1, res, browserModule;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            try {
-                                if (output == '') {
-                                    debugInfo('No response (empty) from `yarn info`. This package was probably not published before');
-                                    // throw new Error('Empty response from `yarn info`. This pkg was probably not published before');
-                                    // return;
-                                    shouldPublish = true;
-                                    //don't patch the version number (default, see above), use the current version
-                                    version = pack.version;
-                                }
-                                else {
-                                    info = JSON.parse(output);
-                                }
-                                // var stats = fs.statSync(path.join(packageDirectory));
-                                // var files = fs.readdirSync(path.join(packageDirectory,'src'));
+                            _a.trys.push([0, 3, , 4]);
+                            if (output == '' || output.includes('E404')) {
+                                debugInfo('Empty or 404 response from `npm info`. This package was probably not published before');
+                                // throw new Error('Empty response from `yarn info`. This pkg was probably not published before');
+                                // return;
+                                shouldPublish = true;
+                                //don't patch the version number (default, see above), use the current version
+                                version = pack.version;
                             }
-                            catch (err) {
-                                chalk.red(pckg.packageName + ' failed: ' + err.message + '\n');
-                                console.warn('Returned JSON from npm: ' + output);
-                                return [2 /*return*/, previousResult + ' ' + chalk.red(pckg.packageName + ' failed: ' + err.message + '\n')];
+                            else {
+                                info = JSON.parse(output);
                             }
                             if (!info) return [3 /*break*/, 2];
-                            lastPublish = info.data.time[info.data.version];
+                            lastPublish = void 0;
+                            //yarn:
+                            // let lastPublish = info.data.time[info.data.version];
+                            lastPublish = info.time[info.version];
                             lastPublishDate = new Date(lastPublish);
                             return [4 /*yield*/, getLastCommitTime(pckg.path)];
                         case 1:
@@ -1253,25 +1250,37 @@ var publishUpdated = function (test) {
                             if (!lastCommit) {
                                 shouldPublish = false;
                                 debugInfo('Could not determine last git commit');
-                                return [2 /*return*/, previousResult + ' ' + chalk.red(pckg.packageName + ' - could not determine last commit\n')];
+                                // return previousResult + ' ' + chalk.red(pckg.packageName + ' - could not determine last commit\n');
+                                return [2 /*return*/, chalk.red(pckg.packageName + ' - could not determine last commit')];
                             }
                             else {
                                 //NOTE: removed lastModified, because switching branches will say that the file was modified and cause everything to publish
                                 //SO: now you NEED TO commit before it picks up that you should publish
                                 shouldPublish = lastPublishDate.getTime() < lastCommit.getTime();
-                                if (shouldPublish) {
-                                    debugInfo(lastPublishDate.toDateString() +
-                                        ' ' +
-                                        lastPublishDate.toTimeString() +
-                                        ' published ' +
-                                        info.data.version);
-                                    debugInfo(lastCommit.toDateString() + ' ' + new Date(lastCommit).toTimeString() + ' source last committed');
-                                }
+                                // if (shouldPublish) {
+                                //   log(
+                                //     lastPublishDate.toDateString() +
+                                //     ' ' +
+                                //     lastPublishDate.toTimeString() +
+                                //     ' published ' +
+                                //     info.version,
+                                //   );
+                                //   log(
+                                //     lastCommit.toDateString() + ' ' + new Date(lastCommit).toTimeString() + ' source last committed',
+                                //   );
+                                // }
                             }
                             _a.label = 2;
-                        case 2:
+                        case 2: return [3 /*break*/, 4];
+                        case 3:
+                            err_1 = _a.sent();
+                            console.log(chalk.red(pckg.packageName + ' failed: ' + err_1.message + '\n'));
+                            console.warn('Returned JSON from npm: ' + output);
+                            // return previousResult + ' ' + chalk.red(pckg.packageName + ' failed: ' + err.message + '\n');
+                            return [2 /*return*/, chalk.red(pckg.packageName + ' failed: ' + err_1.message)];
+                        case 4:
                             if (shouldPublish) {
-                                res = publishPackage(pckg, previousResult, test, info, version);
+                                res = publishPackage(pckg, test, info, version);
                                 if (pckg.packageName == 'browser-core') {
                                     browserCoreBuilt = true;
                                 }
@@ -1280,33 +1289,53 @@ var publishUpdated = function (test) {
                                     browserModule = packages.find(function (m) { return m.packageName == 'browser-core'; });
                                     return [2 /*return*/, Promise.resolve(res).then(function (previousResult) {
                                             log('# Automatically also publishing package browser-core');
-                                            return publishPackage(browserModule, previousResult, test);
+                                            return publishPackage(browserModule, test);
                                         })];
                                 }
                                 return [2 /*return*/, res];
                             }
-                            return [2 /*return*/, previousResult];
+                            // return previousResult + ' ' + chalk.green(pckg.packageName + ' latest version is up to date\n');
+                            return [2 /*return*/, chalk.green(pckg.packageName + ' latest version is up to date')];
                     }
                 });
             }); })["catch"](function (_a) {
                 var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
-                console.log(error.message);
-                return previousResult + ' ' + chalk.red(pckg.packageName + ' failed\n');
+                if (error) {
+                    console.log(error.message);
+                }
+                if (stdout) {
+                    console.log(stderr);
+                }
+                if (stderr) {
+                    console.log(stderr);
+                }
+                // return previousResult + ' ' + chalk.red(pckg.packageName + ' failed\n');
+                console.warn(chalk.red(pckg.packageName + ' failed'));
+                return chalk.red(pckg.packageName + ' failed');
             });
+        }).then(function (res) {
+            log(res);
+            results.push(res);
+        })["catch"](function (err) {
+            console.warn(chalk.red(pckg.packageName + ' failed: ' + err.toString()));
+            results.push(chalk.red(pckg.packageName + ' failed: ' + err.toString()));
         });
     });
-    return p.then(function (messages) {
-        if (messages == '') {
-            console.log('All published packages are already up-to-date.');
-        }
-        else {
-            console.log('Summary: \n' + messages);
-        }
+    return p.then(function () {
+        // if (messages == '')
+        // {
+        //   console.log('All published packages are already up-to-date.');
+        // }
+        // else
+        // {
+        console.log('Summary:                                \n' + results.join('\n'));
+        // }
     });
 };
-var publishPackage = function (pkg, previousResult, test, info, publishVersion) {
+var publishPackage = function (pkg, test, info, publishVersion) {
     if (!publishVersion) {
-        publishVersion = info ? getNextVersion(info.data.version) : '';
+        // publishVersion = info ? getNextVersion(info.data.version) : '';
+        publishVersion = info ? getNextVersion(info.version) : '';
     }
     if (test) {
         debugInfo('should publish ' + pkg.packageName + ' ' + publishVersion);
@@ -1315,25 +1344,25 @@ var publishPackage = function (pkg, previousResult, test, info, publishVersion)
         console.log(chalk.blue('publishing ' + pkg.packageName + ' ' + publishVersion));
     }
     if (!test) {
-        return execPromise("cd ".concat(pkg.path, " && yarn publish").concat(publishVersion ? ' --new-version ' + publishVersion : ''), true, false, {}, true)
+        return execPromise("cd ".concat(pkg.path, " && yarn version ").concat(publishVersion, " && yarn npm publish"), true, false, {}, true)
             .then(function (res) {
             if (res.indexOf('Aborted due to warnings') !== -1 ||
                 res.indexOf('Could not publish') !== -1 ||
-                res.indexOf("Couldn't publish") !== -1) {
+                res.indexOf('Couldn\'t publish') !== -1) {
                 console.log(res);
-                return previousResult + ' ' + chalk.red(pkg.packageName + ' failed\n');
+                return chalk.red(pkg.packageName + ' failed\n');
             }
             console.log(chalk.green('Successfully published ' + pkg.path + ' ' + publishVersion));
-            return previousResult + ' ' + chalk.green(pkg.packageName + ' published ' + publishVersion + '\n');
+            return chalk.green(pkg.packageName + ' published ' + publishVersion + '\n');
         })["catch"](function (_a) {
             var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
             console.log(chalk.red('Failed to publish: ' + error.message));
-            return previousResult + ' ' + chalk.red(pkg.packageName + ' failed to publish\n');
+            return chalk.red(pkg.packageName + ' failed to publish\n');
         });
     }
     else {
         //when testing what needs to be published
-        return previousResult + ' ' + chalk.blue(pkg.packageName + ' should publish\n');
+        return chalk.blue(pkg.packageName + ' should publish');
     }
 };
 var buildUpdated = function (back, target, target2, test) {
@@ -1467,9 +1496,9 @@ var executeCommandForEachPackage = function (packages, command, filterMethod, fi
             return seen_1;
         });
     }
-    log("Executing '" +
+    log('Executing \'' +
         chalk.blueBright(command) +
-        "' on packages " +
+        '\' on packages ' +
         chalk.magenta(packages.map(function (m) { return m.packageName; }).join(', ')));
     var p = Promise.resolve(true);
     packages.forEach(function (pkg) {
@@ -1510,11 +1539,11 @@ var executeCommandForPackage = function (packageName, command) {
         return modDetails.packageName.indexOf(packageName) !== -1 || modDetails.packageName.indexOf(packageName) !== -1;
     });
     if (packageDetails) {
-        log("Executing 'cd " + packageDetails.path + ' && yarn lincd' + (command ? ' ' + command : '') + "'");
+        log('Executing \'cd ' + packageDetails.path + ' && yarn lincd' + (command ? ' ' + command : '') + '\'');
         return execp('cd ' + packageDetails.path + ' && yarn lincd' + (command ? ' ' + command : ''));
     }
     else {
-        warn("Could not find a pkg who's name (partially) matched " + chalk.cyan(packageName));
+        warn('Could not find a pkg who\'s name (partially) matched ' + chalk.cyan(packageName));
     }
 };
 program.parse(process.argv);

package/lib/config-grunt.js

@@ -118,8 +118,8 @@ function setupGrunt(grunt, moduleName, config) {
     // log('setting grunt config');
     grunt.initConfig({
         exec: {
-            'build-lib': 'tsc --pretty',
-            'build-lib-es5': 'tsc --pretty -p tsconfig-es5.json',
+            'build-lib': 'yarn exec tsc --pretty',
+            'build-lib-es5': 'yarn exec tsc --pretty -p tsconfig-es5.json',
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
             test: 'tsc -w',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
     "@lodder/grunt-postcss": "^3.1.1",
-    "@types/node": "^17.0.14",
+    "@types/node": "^18.11.10",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "babel-loader": "^8.2.5",
@@ -58,7 +58,7 @@
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
     "lincd": "^0.5",
-    "lincd-jsonld": "^0.1.8",
+    "lincd-jsonld": "^0.1.13",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.6.1",
     "open": "^8.4.0",