lincd-cli 0.2.10 → 0.2.12

package/lib/utils.js

@@ -51,10 +51,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.getGruntConfig = exports.getPackageJSON = void 0;
+exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getPackageJSON = void 0;
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
+var child_process_1 = require("child_process");
 var _a = require('find-nearest-package-json'), findNearestPackageJson = _a.findNearestPackageJson, findNearestPackageJsonSync = _a.findNearestPackageJsonSync;
 var getPackageJSON = function (root, error) {
     if (root === void 0) { root = process.cwd(); }
@@ -86,24 +87,95 @@ var getGruntConfig = function (root, error) {
     }
 };
 exports.getGruntConfig = getGruntConfig;
-/*export function getShapesJSONLD(packageExports): Promise<string> {
-  // return JSONLDWriter.stringify(getShapes(packageExports));
+function execp(cmd, log, allowError, options) {
+    if (log === void 0) { log = false; }
+    if (allowError === void 0) { allowError = false; }
+    if (options === void 0) { options = {}; }
+    // opts || (opts = {});
+    if (log)
+        console.log(chalk_1["default"].cyan(cmd));
+    return new Promise(function (resolve, reject) {
+        var child = (0, child_process_1.exec)(cmd, options);
+        child.stdout.pipe(process.stdout);
+        child.stderr.pipe(process.stderr);
+        // process.stdin.pipe(child.stdin);
+        child.on('close', function (code) {
+            if (code === 0) {
+                resolve(null);
+            }
+            else {
+                reject();
+            }
+            // console.log('killing child');
+            // child.kill('SIGHUP');
+            // resolve(code);
+        });
+        // child.on('data', function (result) {
+        // 	// if (log)
+        // 	// {
+        // 	// 	console.log(result);
+        // 	// }
+        // 	resolve(result);
+        // 	console.log('resolve data');
+        //
+        // });
+        child.on('error', function (err) {
+            if (!allowError) {
+                // console.log('reject err');
+                reject(err);
+                return;
+            }
+            else if (log) {
+                console.warn(err);
+            }
+            // console.log('resolve err');
+            resolve(null);
+        });
+        child.on('exit', function (code, signal) {
+            if (code !== 0) {
+                reject('Child process exited with error code ' + code);
+                return;
+            }
+            // console.log('resolve exit');
+            resolve(null);
+        });
+    });
 }
-
-export function getShapes(packageExports): CoreSet<SHACL_Shape> {
-  let shapes = new CoreSet<SHACL_Shape>();
-  for (var key in packageExports) {
-    let moduleExport = packageExports[key];
-    // console.log(key, Object.keys(packageExports[key]));
-    if (moduleExport.shape) {
-      // console.log(Object.keys(moduleExport.shape));
-      if (moduleExport.shape && moduleExport.shape instanceof SHACL_Shape) {
-        shapes.add(moduleExport.shape);
-      }
-    }
-  }
-  return shapes;
-}*/
+exports.execp = execp;
+function execPromise(command, log, allowError, options, pipeOutput) {
+    if (log === void 0) { log = false; }
+    if (allowError === void 0) { allowError = false; }
+    if (pipeOutput === void 0) { pipeOutput = false; }
+    return new Promise(function (resolve, reject) {
+        if (log)
+            console.log(chalk_1["default"].cyan(command));
+        var child = (0, child_process_1.exec)(command, options, function (error, stdout, stderr) {
+            if (error) {
+                if (!allowError) {
+                    reject({ error: error, stdout: stdout, stderr: stderr });
+                    return;
+                }
+                else if (log) {
+                    console.warn(error);
+                }
+            }
+            //TODO: getting a typescript error for 'trim()', this worked before, is it still used? do we log anywhere?
+            var result = stdout['trim']();
+            if (log) {
+                // console.log(chalk"RESOLVING "+command);
+                console.log(result);
+                // console.log('ERRORS:'+(result.indexOf('Aborted due to warnings') !== -1));
+                // console.log('stderr:'+stderr);
+            }
+            resolve(result);
+        });
+        if (pipeOutput) {
+            child.stdout.pipe(process.stdout);
+            child.stderr.pipe(process.stderr);
+        }
+    });
+}
+exports.execPromise = execPromise;
 // export function generateScopedName(moduleName,name, filename, css) {
 function generateScopedName(moduleName, name, filename, css) {
     // console.log(moduleName,name,filename,css);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -58,9 +58,11 @@
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
     "lincd": "^0.5",
+    "lincd-app": "^0.1",
     "lincd-jsonld": "^0.1.13",
+    "lincd-modules": "^0.1",
     "load-grunt-tasks": "^5.1.0",
-    "mini-css-extract-plugin": "^2.6.1",
+    "mini-css-extract-plugin": "^2.7.5",
     "open": "^8.4.0",
     "postcss": "^8.4.17",
     "postcss-import": "^15.0.0",
@@ -72,14 +74,14 @@
     "sass": "^1.55.0",
     "sass-loader": "^13.0.2",
     "source-map-loader": "^4.0.0",
-    "tailwindcss": "^3.1.6",
+    "tailwindcss": "^3.2.7",
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.4.1",
     "ts-node": "10.7",
     "tsc-hooks": "^1.1.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "typescript": "4.8.4",
-    "webpack": "^5.74.0",
+    "webpack": "^5.76.3",
     "webpack-bundle-analyzer": "^4.6.1",
     "webpack-license-plugin": "^4.2.2"
   },

package/utils.js

@@ -1,39 +0,0 @@
-"use strict";
-exports.__esModule = true;
-exports.getShapes = exports.getShapesJSONLD = exports.getPackageJSON = void 0;
-var fs = require("fs");
-var path = require("path");
-var SHACL_Shape_1 = require("lincd/lib/shapes/SHACL_Shape");
-var CoreSet_1 = require("lincd/lib/collections/CoreSet");
-var JSONLDWriter_1 = require("lincd-jsonld/lib/JSONLDWriter");
-var getPackageJSON = function (root) {
-    if (root === void 0) { root = process.cwd(); }
-    var packagePath = path.join(root, 'package.json');
-    if (fs.existsSync(packagePath)) {
-        return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-    }
-    else if (root === process.cwd()) {
-        console.warn('Could not find package.json. Make sure you run this command from the root of a lincd module or a lincd yarn workspace');
-        process.exit();
-    }
-};
-exports.getPackageJSON = getPackageJSON;
-function getShapesJSONLD(moduleExports) {
-    return JSONLDWriter_1.JSONLDWriter.stringify(getShapes(moduleExports));
-}
-exports.getShapesJSONLD = getShapesJSONLD;
-function getShapes(moduleExports) {
-    var shapes = new CoreSet_1.CoreSet();
-    for (var key in moduleExports) {
-        var moduleExport = moduleExports[key];
-        // console.log(key, Object.keys(moduleExports[key]));
-        if (moduleExport.shape) {
-            // console.log(Object.keys(moduleExport.shape));
-            if (moduleExport.shape && moduleExport.shape instanceof SHACL_Shape_1.SHACL_Shape) {
-                shapes.add(moduleExport.shape);
-            }
-        }
-    }
-    return shapes;
-}
-exports.getShapes = getShapes;