lincd-cli 0.1.21 → 0.1.23

package/defaults/app-with-backend/frontend/src/components/Spinner.scss

@@ -1,9 +1,9 @@
 .spinner.active {
-  border: 4px solid #474545;
-  border-top: 4px solid lightblue;
+  border: 4px solid transparent;
+  border-top: 4px solid #474545;
   border-radius: 50%;
-  width: 24px;
-  height: 24px;
+  width: 16px;
+  height: 16px;
   animation: spin 1s linear infinite;
 }
 @keyframes spin {

package/defaults/app-with-backend/frontend/src/components/Spinner.tsx

@@ -1,10 +1,11 @@
 import './Spinner.scss';
+import * as style from './Spinner.scss.json';
 export default function Spinner({active = true}) {
   return (
     <div
-      className={['spinner', active && 'active'].join(' ')}
+      className={[style.spinner, active && style.active].join(' ')}
       role="progressbar"
       aria-busy={active ? 'true' : 'false'}
     />
   );
-}
+}

package/defaults/app-with-backend/package.json

@@ -4,7 +4,11 @@
   "description": "",
   "version": "0.1.0",
   "private": true,
-  "author": "",
+  "author":{
+    "name" : "",
+    "url" : "",
+    "email": ""
+  },
   "engines": {
     "node": ">=16.0.0"
   },

package/defaults/component.scss

@@ -0,0 +1,3 @@
+.${camel_name} {
+  display:block;
+}

package/defaults/component.tsx

@@ -0,0 +1,12 @@
+import React from "react";
+import "./${hyphen_name}.scss";
+import {default as style} from "./${hyphen_name}.scss.json";
+import {registerPackageModule,linkedComponent} from '../package';
+
+//TODO: replace SHAPE with an actual Shape class
+export const ${camel_name} = linkedComponent<SHAPE>(SHAPE,({source, sourceShape}) => {
+  return <div className={style.${camel_name}}></div>;
+});
+
+//register all components in this file
+registerPackageModule(module);

package/defaults/module/src/package.ts

@@ -1,4 +1,4 @@
 import {linkedPackage} from 'lincd/lib/utils/Module';
 
-export const {linkedComponent, linkedComponentClass, linkedShape, linkedUtil, linkedOntology} =
+export const {linkedComponent, linkedComponentClass, linkedShape, linkedUtil, linkedOntology, registerPackageModule, registerPackageExport, packageExports} =
   linkedPackage('${module_name}');

package/lib/cli.js

@@ -94,6 +94,13 @@ program
 })
     .description('Creates a new ShapeClass file for your module. Execute this from your module folder.')
     .argument('<name>', 'The name of the shape. Will be used for the file name and the class name');
+program
+    .command('create-component')
+    .action(function (name, uriBase) {
+    return createComponent(name);
+})
+    .description('Creates a new Component file for your package. Execute this from your package folder.')
+    .argument('<name>', 'The name of the component. Will be used for the file name and the export name');
 program
     .command('create-ontology')
     .action(function (prefix, uriBase) {
@@ -142,12 +149,12 @@ program.command('build-updated-since [num-commits-back] [target] [target2]').act
 program.command('build-all [target] [target2]').action(function (target, target2) {
     buildAll(target, target2);
 });
-program.command('modules [action] [includedSpaces]').action(function (command, includedSpaces) {
-    executeCommandForEachModule(getLincdModules(), command, includedSpaces);
-});
-program.command('modules-except [excludedSpaces] [action]').action(function (excludedSpaces, command) {
-    executeCommandForEachModule(getLincdModules(), command, null, excludedSpaces);
+program.command('modules [action] [filter] [filter-value]').action(function (command, filter, filterValue) {
+    executeCommandForEachModule(getLincdModules(), command, filter, filterValue);
 });
+// program.command('modules-except [excludedSpaces] [action]').action((excludedSpaces, command) => {
+//   executeCommandForEachModule(getLincdModules(), command, null, excludedSpaces);
+// });
 program.command('dev [target] [mode]').action(function (target, mode) {
     developModule(target, mode);
 });
@@ -599,13 +606,13 @@ var replaceCurlyVariables = function (string) {
 };
 var capitalize = function (str) { return str.charAt(0).toUpperCase() + str.toLowerCase().slice(1); };
 var camelCase = function (str) {
-    //this version does not replace any capitals already used by the user
     var string = str
         .replace(/[^A-Za-z0-9]/g, ' ')
-        .split(' ')
-        .reduce(function (result, word) { return result + capitalize(word); });
-    //it also leave the first capital intact
-    return string;
+        .split(' ');
+    if (string.length > 1) {
+        return string.reduce(function (result, word) { return result + capitalize(word); });
+    }
+    return str;
 };
 var createOntology = function (prefix, uriBase, basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
@@ -764,6 +771,33 @@ var createShape = function (name, basePath) {
         });
     });
 };
+var createComponent = function (name, basePath) {
+    if (basePath === void 0) { basePath = process.cwd(); }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var targetFolder, _a, hyphenName, camelCaseName, underscoreName, targetFile, targetFile2, indexPath;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    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 + "'");
+                    targetFile = path.join(targetFolder, hyphenName + '.tsx');
+                    fs.copySync(path.join(__dirname, '..', 'defaults', 'component.tsx'), targetFile);
+                    targetFile2 = path.join(targetFolder, hyphenName + '.scss');
+                    fs.copySync(path.join(__dirname, '..', 'defaults', 'component.scss'), targetFile2);
+                    //replace variables in some of the copied files
+                    return [4 /*yield*/, replaceVariablesInFiles(targetFile, targetFile2)];
+                case 1:
+                    //replace variables in some of the copied files
+                    _b.sent();
+                    indexPath = addLineToIndex("import './components/".concat(hyphenName, "';"), 'components');
+                    log("Created a new component template in ".concat(chalk.magenta(targetFile.replace(basePath, ''))), "Created component stylesheet template in ".concat(chalk.magenta(targetFile2.replace(basePath, ''))), "Added an import of this file from ".concat(chalk.magenta(indexPath)));
+                    return [2 /*return*/];
+            }
+        });
+    });
+};
 var createModule = function (name, uriBase, basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
     return __awaiter(void 0, void 0, void 0, function () {
@@ -939,20 +973,21 @@ var register = function (registryURL) {
         var pack = JSON.parse(fs.readFileSync(process.cwd() + '/package.json', 'utf8'));
         var version = pack.version;
         var moduleName = pack.name;
-        var author = pack.author;
-        var description = pack.description;
-        var authorName = pack.author;
-        if (pack.author.name) {
-            authorName = pack.author.name;
-        }
-        console.log(chalk.cyan('registering ' + authorName + "'s module, " + moduleName + ' ' + version + ' in the LINCD registry'));
+        // let author = pack.author;
+        // let description = pack.description;
+        //
+        // let authorName = pack.author;
+        // if (pack.author.name) {
+        //   authorName = pack.author.name;
+        // }
+        console.log(chalk.cyan('registering package ' + moduleName + ' ' + version + ' in the LINCD registry'));
         return fetch(registryURL + '/register', {
             method: 'POST',
             headers: {
                 Accept: 'application/json, text/plain, */*',
                 'Content-Type': 'application/json'
             },
-            body: JSON.stringify({ package: moduleName, version: version, description: description })
+            body: JSON.stringify({ package: moduleName, version: version })
         })
             .then(function (res) { return res.json(); })
             .then(function (json) {
@@ -960,7 +995,7 @@ var register = function (registryURL) {
                 console.log(chalk.red('Response: ' + json.error));
             }
             else if (json.result) {
-                console.log(chalk.cyan('Response: ') + json.result);
+                console.log(chalk.blueBright('Response: ') + json.result);
                 if (json.warning) {
                     console.log(chalk.red('Warning: ') + json.warning);
                 }
@@ -1218,31 +1253,41 @@ var buildUpdated = function (back, target, target2, test) {
     // });
 };
 var printBuildResults = function (failed, done) {
-    log('Build results: '
-        + chalk.green(__spreadArray([], __read(done), false).map(function (m) { return m.moduleName; }).join(', '))
-        + (failed.length > 0 ? (', ' + chalk.red(failed.join(', '))) : '')
-        + '\n');
+    log('Build results: ' +
+        chalk.green(__spreadArray([], __read(done), false).map(function (m) { return m.moduleName; }).join(', ')) +
+        (failed.length > 0 ? ', ' + chalk.red(failed.join(', ')) : '') +
+        '\n');
 };
-var executeCommandForEachModule = function (modules, command, includedSpaces, excludedSpaces) {
+var executeCommandForEachModule = function (modules, command, filterMethod, filterValue) {
     //if a specific set of modules is given
-    if (includedSpaces) {
+    if (filterMethod == 'exclude') {
         //filter modules, so that we only execute on the modules as provided in the command
-        includedSpaces = includedSpaces.split(',');
-        modules = modules.filter(function (module) { return includedSpaces.indexOf(module.moduleName) !== -1; });
-        log('Applying to included spaces');
+        log('Excluding ' + filterValue);
+        filterValue = filterValue.split(',');
+        modules = modules.filter(function (module) { return filterValue.indexOf(module.moduleName) === -1; });
     }
-    //if a specific set of modules is given
-    if (excludedSpaces) {
-        //filter modules, so that we only execute on the modules as provided in the command
-        excludedSpaces = excludedSpaces.split(',');
-        modules = modules.filter(function (module) { return excludedSpaces.indexOf(module.moduleName) === -1; });
-        log('Filtering excluded spaces');
+    var startFrom;
+    //by default start executing, unless 'from' is given
+    var executing = true;
+    //option to start from a specific module in the stack
+    if (filterMethod == 'from') {
+        startFrom = filterValue;
+        if (startFrom) {
+            console.log(chalk.blue('Will skip ahead to ' + startFrom));
+        }
+        var seen_1 = false;
+        modules = modules.filter(function (module) {
+            if (!seen_1 && (module.moduleName == startFrom || module.packageName == startFrom)) {
+                seen_1 = true;
+            }
+            return seen_1;
+        });
     }
-    log("Executing '" + command + "' on modules " + modules.map(function (m) { return m.moduleName; }).join(', '));
+    log("Executing '" + chalk.blueBright(command) + "' on modules " + chalk.magenta(modules.map(function (m) { return m.moduleName; }).join(', ')));
     var p = Promise.resolve(true);
     modules.forEach(function (module) {
         p = p.then(function () {
-            log('# Module ' + module.moduleName + ' - ' + module.path);
+            log('# Package ' + chalk.magenta(module.moduleName));
             return execp('cd ' + module.path + ' && ' + command);
         });
     });

package/lib/config-webpack.js

@@ -32,6 +32,7 @@ var path = require('path');
 var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 var TerserPlugin = require('terser-webpack-plugin');
 var exec = require('child_process').exec;
+var CopyPlugin = require("copy-webpack-plugin");
 var NODE_ENV = process.env.NODE_ENV;
 var nodeProduction = NODE_ENV == 'production';
 // const libraryName = 'lincd';
@@ -77,6 +78,24 @@ function generateWebpackConfig(buildName, moduleName, config) {
         //     return packageName.indexOf('lincd') !== -1;
         //   },
         // }),
+        //NOTE: grunt comes with a copy task, which is ran during `yarn lincd build` but cannot run during `yarn lincd dev`
+        //so here we ALSO copy the same files to cover dev flow
+        new CopyPlugin({
+            patterns: [
+                {
+                    from: "src/**/*.scss",
+                    to: function (_a) {
+                        var context = _a.context, absoluteFilename = _a.absoluteFilename;
+                        // console.log(chalk.magenta(context),chalk.magenta(absoluteFilename),process.cwd());
+                        //turn absolute path into the right lib path (lib is NOT in webpack output path, so need to use '../')
+                        var outputPath = absoluteFilename.replace(process.cwd(), '').replace('/src/', '../lib/');
+                        // console.log(chalk.blueBright(outputPath));
+                        return Promise.resolve(outputPath);
+                    },
+                    noErrorOnMissing: true
+                },
+            ]
+        }),
     ];
     if (config.debug) {
         plugins.push(new watch_run_1["default"]());
@@ -146,7 +165,7 @@ function generateWebpackConfig(buildName, moduleName, config) {
                                 // "postcss-scss": {}, //<-- only add this back if the build gets stuck on //comments in scss files, but I dont think that will be the case anymore
                                 'postcss-modules': {
                                     //   //by default postcss-modules will put out a json file right next to the original css / scss file, this method defines what classnames to use
-                                    generateScopedName: utils_1.generateScopedName,
+                                    generateScopedName: utils_1.generateScopedName.bind(null, moduleName),
                                     globalModulePaths: [/tailwind/]
                                 },
                                 tailwindcss: {

package/lib/utils.js

@@ -55,6 +55,7 @@ exports.flatten = exports.warn = exports.debug = exports.log = exports.generateS
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
 var chalk_1 = __importDefault(require("chalk"));
+// const {findNearestPackageJson, findNearestPackageJsonSync} = require('find-nearest-package-json');
 var getPackageJSON = function (root, error) {
     if (root === void 0) { root = process.cwd(); }
     if (error === void 0) { error = true; }
@@ -88,7 +89,13 @@ export function getShapes(packageExports): CoreSet<SHACL_Shape> {
   }
   return shapes;
 }*/
-function generateScopedName(name, filename, css) {
+function generateScopedName(moduleName, name, filename, css) {
+    // console.log(moduleName,name,filename,css);
+    // var file = path.basename(filename, '.scss');
+    // let nearestPackageJson = findNearestPackageJsonSync(filename);
+    // let packageName = nearestPackageJson ? nearestPackageJson.data.name : packageJson.name;
+    // return packageName.replace(/[^a-zA-Z0-9_]+/g, '_') + '_' + file + '_' + name;
+    // process.exit();
     var path = require('path');
     var file = path.basename(filename, '.scss');
     var module = filename.match(/[\\\/]modules[\\\/]([\w\-_]+)/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -18,6 +18,7 @@
   "repository": "https://github.com:Semantu/lincd.org",
   "author": {
     "name": "René Verheij",
+    "url": "https://github.com/flyon",
     "email": "rpwverheij@gmail.com"
   },
   "license": "MPL-2.0",
@@ -40,6 +41,7 @@
     "child-process-promise": "^2.2.1",
     "colors": "^1.4.0",
     "commander": "^9.4.0",
+    "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "fs-extra": "^10.1.0",
     "glob": "^7.1.6",