Merge pull request #462 from Inist-CNRS/detach-2

feat: 🎸 add [detach]

Author: touv

.github/workflows/node.js.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x, 20.x, 22.x, 24.x]
+        node-version: [14.x, 16.x, 18.x, 20.x, 22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -47,6 +47,7 @@ jobs:
     - name: Testing all packages
       env:
         LD_LIBRARY_PATH: '/deps/lib'
+        DEBUG: 'ezs:error,ezs:warn'
       run: yarn run ci:test
 
     - name: Coveralls Parallel

package.json

@@ -5,7 +5,7 @@
     "packages/*"
   ],
   "engines": {
-    "node": ">=12.0.0",
+    "node": ">=14.0.0",
     "yarn": ">= 1.0.0",
     "npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
   },

packages/core/bin/ezs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
-require('app-module-path/cwd');
-require('../lib/cli').default(console.error);
+import 'app-module-path/cwd.js';
+import cli from '../src/cli.js';
 
+cli(console.error);

packages/core/package.json

@@ -54,7 +54,11 @@
     "transformer"
   ],
   "license": "MIT",
-  "main": "./lib/index.js",
+  "type": "module",
+  "exports": {
+    "import": "./src/index.js",
+    "require": "./lib/index.js"
+  },
   "publishConfig": {
     "access": "public"
   },

packages/core/src/compactor.js

@@ -22,7 +22,7 @@ const z = chooseZ();
 
 export function compressStream(ezs, opts = {}) {
     const encoding = opts['Content-Encoding'] || opts['content-encoding'] || 'identity';
-    if (typeof z.createGunzip === 'function' && encoding === 'gzip') {
+    if (z && typeof z.createGunzip === 'function' && encoding === 'gzip') {
         debug('ezs:debug')('ezs will use zlib to compress stream.');
         return z.createGzip();
     }
@@ -32,7 +32,7 @@ export function compressStream(ezs, opts = {}) {
 
 export function uncompressStream(ezs, opts = {}) {
     const encoding = opts['Content-Encoding'] || opts['content-encoding'] || 'identity';
-    if (typeof z.createGunzip === 'function' && encoding === 'gzip') {
+    if (z && typeof z.createGunzip === 'function' && encoding === 'gzip') {
         debug('ezs:debug')('ezs will use zlib to uncompress stream.');
         return z.createGunzip();
     }

packages/core/src/constants.js

@@ -1,5 +1,10 @@
+import fs from 'fs';
+import path from 'path';
 import filenameRegex from 'filename-regex';
-import pckg from '../package.json' with { type: 'json' };
+import filedirname from 'filedirname';
+
+const [, dirname] = filedirname();
+const pckg = JSON.parse(fs.readFileSync(path.resolve(dirname, '../package.json')));
 
 export const VERBOSE = 'ezs:*,-ezs:debug,-ezs:trace';
 export const VERSION = pckg.version;

packages/core/src/file.js

@@ -25,8 +25,8 @@ function findFileIn(paths, name) {
 export function useFile(ezs, name) {
     const names = [
         name,
-        '@ezs/'.concat(name.replace(/^@ezs\//, '')),
-        'ezs-'.concat(name.replace(/^ezs-/, '')),
+        '@ezs/'.concat(String(name).replace(/^@ezs\//, '')),
+        'ezs-'.concat(String(name).replace(/^ezs-/, '')),
     ];
     const plugName1 = names.map((n) => check(n)).filter(Boolean).shift();
     const plugName2 = names.map((n) => findFileIn(ezs.getPath(), n)).filter(Boolean).shift();

packages/core/src/index.js

@@ -54,6 +54,12 @@ ezs.parseFile = (filename) => Script(ezs.loadScript(filename));
 ezs.catch = (func) => new Catcher(func);
 ezs.toBuffer = (options) => new Output(options);
 ezs.use = (plugin) => Statement.set(ezs, plugin);
+ezs.useFiles = (files) => {
+    if (files) {
+        files.map(file=> Statement.load(ezs, file));
+    }
+    return Statement.list();
+};
 ezs.addPath = (p) => ezs.settings.pluginPaths.push(p);
 ezs.getPath = () => ezs.settings.pluginPaths;
 ezs.getCache = () => ezsCache;

packages/core/src/json.js

@@ -1,6 +1,7 @@
 import Expression from './expression.js';
 
 function parse(data) {
+    if (!data) return data;
     return JSON.parse(data, (key, value) => {
         if (value && typeof value === 'string' && value.indexOf('Expression::') === 0) {
             return new Expression(JSON.parse(value.replace('Expression::', '')));
@@ -10,6 +11,7 @@ function parse(data) {
 }
 
 function stringify(data) {
+    if (!data) return data;
     return JSON.stringify(data);
 }
 

packages/core/src/statement.js

@@ -3,12 +3,13 @@ import { useFile } from './file.js';
 import transit from './statements/transit.js';
 
 const pluginsModules = {};
+const pluginsFiles = [];
 const pluginsList = {};
 
 function set(ezs, plugin) {
     if (typeof plugin !== 'object') {
         throw new Error(
-            "Statement is not loaded. It's not a valid plugin (should be an object).",
+            'Statement is not loaded. It\'s not a valid plugin (should be an object).',
         );
     }
     const pluginList = plugin.default ? plugin.default : plugin; // ES6 hack
@@ -35,6 +36,7 @@ function load(ezs, name) {
         );
     }
     if (!pluginsModules[fileName]) {
+        pluginsFiles.push(fileName);
         pluginsModules[fileName] = import(fileName);
         pluginsModules[fileName].then((funcs) => {
             set(ezs, funcs);
@@ -93,9 +95,14 @@ function exists(ezs, pluginName) {
     return pluginsList[pluginName] !== undefined;
 }
 
+function list() {
+    return pluginsFiles;
+}
+
 export default {
     get,
     set,
     load,
     exists,
+    list,
 };