Merge pull request #463 from Inist-CNRS/esm

touv · web-flow · commit 56ca7b89992e · 2025-08-25T14:28:40.000+02:00
Esm everywhere
diff --git a/packages/basics/test/basics.js b/packages/basics/test/basics.js
@@ -1,9 +1,12 @@
-const assert = require('assert');
-const from = require('from');
-const { PassThrough } = require('stream');
-const ezs = require('../../core/src');
+import assert from 'assert';
+import { PassThrough } from 'stream';
+import fs from 'fs';
+import from from 'from';
+import ezs from '../../core/src';
+import statements from '../src';
+
+ezs.use(statements);
 
-ezs.use(require('../src'));
 
 describe('test', () => {
     it('CSVObject #1', (done) => {
diff --git a/packages/basics/test/tar-dump.js b/packages/basics/test/tar-dump.js
@@ -1,8 +1,9 @@
-const assert = require('assert');
-const from = require('from');
-const ezs = require('../../core/src');
+import assert from 'assert';
+import from from 'from';
+import ezs from '../../core/src';
+import ezsBasics from '../src';
 
-ezs.use(require('../src'));
+ezs.use(ezsBasics);
 
 describe('TARDump', () => {
     const input = [
diff --git a/packages/basics/test/tar-extract.js b/packages/basics/test/tar-extract.js
@@ -1,8 +1,9 @@
-const assert = require('assert');
-const fs = require('fs');
-const ezs = require('../../core/src');
+import assert from 'assert';
+import fs from 'fs';
+import ezs from '../../core/src';
+import ezsBasics from '../src';
 
-ezs.use(require('../src'));
+ezs.use(ezsBasics);
 
 describe('TARExtract', () => {
     it('should extract JSON content (manual)', (done) => {
diff --git a/packages/basics/test/txt-zip.js b/packages/basics/test/txt-zip.js
@@ -1,9 +1,10 @@
-const assert = require('assert');
-const from = require('from');
-const pako = require('pako');
-const ezs = require('../../core/src');
+import assert from 'assert';
+import from from 'from';
+import pako from 'pako';
+import ezs from '../../core/src';
+import ezsBasics from '../src';
 
-ezs.use(require('../src'));
+ezs.use(ezsBasics);
 
 describe('txt-zip', () => {
     it('should zip a stream containing a string', (done) => {
diff --git a/packages/basics/test/zip-extract.js b/packages/basics/test/zip-extract.js
@@ -1,8 +1,10 @@
-const assert = require('assert');
-const fs = require('fs');
-const ezs = require('../../core/src');
+import assert from 'assert';
+import fs from 'fs';
+import from from 'from';
+import ezs from '../../core/src';
+import ezsBasics from '../src';
 
-ezs.use(require('../src'));
+ezs.use(ezsBasics);
 
 describe('ZIPExtract', () => {
     it('should extract JSON content', (done) => {
diff --git a/packages/core/src/constants.js b/packages/core/src/constants.js
@@ -1,7 +1,7 @@
 import filenameRegex from 'filename-regex';
-import { version } from '../package.json';
+import pckg from '../package.json' with { type: 'json' };
 
 export const VERBOSE = 'ezs:*,-ezs:debug,-ezs:trace';
-export const VERSION = version;
+export const VERSION = pckg.version;
 export const STARTED_AT = Date.now();
 export const RX_FILENAME = filenameRegex();
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
@@ -150,4 +150,5 @@ ezs.createTrap = (file, env) => {
 };
 ezs.use(Statements);
 
-module.exports = ezs;
+//module.exports = ezs;
+export default ezs;
diff --git a/packages/core/src/server/errorHandler.js b/packages/core/src/server/errorHandler.js
@@ -1,6 +1,6 @@
 import debug from 'debug';
 import JSONB from 'json-buffer';
-import { httpRequestErrorTotal }  from './metrics';
+import { httpRequestErrorTotal }  from './metrics.js';
 
 const errorHandler = (ezs, request, response) => (error, code = 400) => {
     const stringError = ezs.serializeError(error);
diff --git a/packages/core/src/server/index.js b/packages/core/src/server/index.js
@@ -5,24 +5,24 @@ import eos from 'end-of-stream';
 import controlServer from 'http-shutdown';
 import { parse } from 'url';
 import debug from 'debug';
-import knownPipeline from './knownPipeline';
-import serverInformation from './serverInformation';
-import serverControl from './serverControl';
-import errorHandler from './errorHandler';
-import settings from '../settings';
-import { RX_FILENAME } from '../constants';
+import knownPipeline from './knownPipeline.js';
+import serverInformation from './serverInformation.js';
+import serverControl from './serverControl.js';
+import errorHandler from './errorHandler.js';
+import settings from '../settings.js';
+import { RX_FILENAME } from '../constants.js';
 import {
     metrics,
     httpConnectionTotal,
     httpConnectionOpen,
     httpRequestDurationMicroseconds,
     aggregatorRegistry,
-} from './metrics';
+} from './metrics.js';
 import {
     createFusible,
     enableFusible,
     disableFusible
-} from '../fusible';
+} from '../fusible.js';
 
 function isPipeline() {
     const f = this.pathName.match(RX_FILENAME);
diff --git a/packages/core/src/server/knownPipeline.js b/packages/core/src/server/knownPipeline.js
@@ -6,11 +6,11 @@ import { pipeline } from 'stream';
 import once from 'once';
 import merge from 'lodash/merge.js';
 import cloneDeep from 'lodash/cloneDeep.js';
-import { metricsHandle } from './metrics';
-import errorHandler from './errorHandler';
-import { isFile } from '../file';
-import breaker from '../statements/breaker';
-import settings from '../settings';
+import { metricsHandle } from './metrics.js';
+import errorHandler from './errorHandler.js';
+import { isFile } from '../file.js';
+import breaker from '../statements/breaker.js';
+import settings from '../settings.js';
 
 const dispositionFrom = ({ extension }) => (extension ? `attachment; filename="dump.${extension}"` : 'inline');
 
diff --git a/packages/core/src/server/metrics.js b/packages/core/src/server/metrics.js
@@ -7,7 +7,7 @@ import {
     AggregatorRegistry,
     collectDefaultMetrics,
 } from 'prom-client';
-import settings from '../settings';
+import settings from '../settings.js';
 
 
 
diff --git a/packages/core/src/server/serverControl.js b/packages/core/src/server/serverControl.js
@@ -1,5 +1,5 @@
 import debug from 'debug';
-import { disableFusible } from '../fusible';
+import { disableFusible } from '../fusible.js';
 
 const serverInformation =  () => (request, response, next) => {
     if (!request.methodMatch(['DELETE']) || request.pathName !== '/') {
diff --git a/packages/core/src/server/serverInformation.js b/packages/core/src/server/serverInformation.js
@@ -5,10 +5,10 @@ import pathExists from 'path-exists';
 import autocast from 'autocast';
 import { dirname, resolve as pathResolve } from 'path';
 import _ from 'lodash';
-import settings from '../settings';
+import settings from '../settings.js';
 import {
     VERSION, STARTED_AT,
-} from '../constants';
+} from '../constants.js';
 
 const keyOfPathItemObject = [ // https://swagger.io/specification/
     '$ref',
diff --git a/packages/core/src/statements/breaker.js b/packages/core/src/statements/breaker.js
@@ -1,5 +1,5 @@
 import debug from 'debug';
-import { checkFusible } from '../fusible';
+import { checkFusible } from '../fusible.js';
 /**
  * Break the stream  if the control file cannot be checked
  *
diff --git a/packages/core/src/statements/fork.js b/packages/core/src/statements/fork.js
@@ -1,12 +1,13 @@
 import debug from 'debug';
-import { clone, set } from 'lodash';
+import clone from 'lodash/clone.js'
+import set from 'lodash/set.js';
 
-import breaker from './breaker';
+import breaker from './breaker.js';
 import {
     createFusible,
     enableFusible,
     disableFusible
-} from '../fusible';
+} from '../fusible.js';
 
 
 
diff --git a/packages/core/src/statements/group.js b/packages/core/src/statements/group.js
@@ -1,4 +1,4 @@
-import settings from '../settings';
+import settings from '../settings.js';
 import set  from 'lodash/set.js';
 
 /**
diff --git a/packages/core/src/statements/identify.js b/packages/core/src/statements/identify.js
@@ -1,7 +1,7 @@
 import  { createHash } from 'crypto';
 import _ from 'lodash';
-import generate from 'nanoid/async/generate';
-import nolookalikes from 'nanoid-dictionary/nolookalikes';
+import generate from 'nanoid/async/generate.js';
+import nolookalikes from 'nanoid-dictionary/nolookalikes.js';
 
 export const validKey = (input) =>
     Boolean(input) &&
diff --git a/packages/core/src/statements/index.js b/packages/core/src/statements/index.js
@@ -1,41 +1,41 @@
-import extract from './extract';
-import assign from './assign';
-import replace from './replace';
-import shift from './shift';
-import pop from './pop';
-import keep from './keep';
-import debug from './debug';
-import concat from './concat';
-import remove from './remove';
-import unpack from './unpack';
-import pack from './pack';
-import transit from './transit';
-import shuffle from './shuffle';
-import env from './env';
-import group from './group';
-import ungroup from './ungroup';
-import parallel from './parallel';
-import spawn from './spawn';
-import delegate from './delegate';
-import singleton from './singleton';
-import tracer from './tracer';
-import truncate from './truncate';
-import validate from './validate';
-import dump from './dump';
-import time from './time';
-import ignore from './ignore';
-import exchange from './exchange';
-import swing from './swing';
-import loop from './loop';
-import map from './map';
-import dedupe from './dedupe';
-import identify from './identify';
-import throttle from './throttle';
-import combine from './combine';
-import expand from './expand';
-import overturn from './overturn';
-import fork from './fork';
-import breaker from './breaker';
+import extract from './extract.js';
+import assign from './assign.js';
+import replace from './replace.js';
+import shift from './shift.js';
+import pop from './pop.js';
+import keep from './keep.js';
+import debug from './debug.js';
+import concat from './concat.js';
+import remove from './remove.js';
+import unpack from './unpack.js';
+import pack from './pack.js';
+import transit from './transit.js';
+import shuffle from './shuffle.js';
+import env from './env.js';
+import group from './group.js';
+import ungroup from './ungroup.js';
+import parallel from './parallel.js';
+import spawn from './spawn.js';
+import delegate from './delegate.js';
+import singleton from './singleton.js';
+import tracer from './tracer.js';
+import truncate from './truncate.js';
+import validate from './validate.js';
+import dump from './dump.js';
+import time from './time.js';
+import ignore from './ignore.js';
+import exchange from './exchange.js';
+import swing from './swing.js';
+import loop from './loop.js';
+import map from './map.js';
+import dedupe from './dedupe.js';
+import identify from './identify.js';
+import throttle from './throttle.js';
+import combine from './combine.js';
+import expand from './expand.js';
+import overturn from './overturn.js';
+import fork from './fork.js';
+import breaker from './breaker.js';
 
 export default {
     extract,
diff --git a/packages/core/src/statements/loop.js b/packages/core/src/statements/loop.js
@@ -1,4 +1,4 @@
-import breaker from './breaker';
+import breaker from './breaker.js';
 
 async function loopFunc(data, feed) {
     const { ezs } = this;
diff --git a/packages/core/src/statements/overturn.js b/packages/core/src/statements/overturn.js
@@ -1,11 +1,11 @@
 import { resolve  as resolvePath } from 'path';
-import generate from 'nanoid/async/generate';
-import nolookalikes from 'nanoid-dictionary/nolookalikes';
 import { tmpdir } from 'os';
 import _ from 'lodash';
 import cacache from 'cacache';
 import makeDir from 'make-dir';
 import pathExists from 'path-exists';
+import generate from 'nanoid/async/generate.js';
+import nolookalikes from 'nanoid-dictionary/nolookalikes.js';
 
 /**
  * Takes an `Object` and substitute twice a field with the corresponding value found in a external pipeline
diff --git a/packages/core/src/statements/parallel.js b/packages/core/src/statements/parallel.js
@@ -1,6 +1,6 @@
 import merge from 'merge2';
 import debug from 'debug';
-import settings from '../settings';
+import settings from '../settings.js';
 
 export const duplexer = (ezs, commands, environment, logger) => () => {
     const input = ezs.createStream(ezs.objectMode());
diff --git a/packages/core/test/commands.js b/packages/core/test/commands.js
@@ -3,7 +3,7 @@ import ezs from '../src';
 import Commands from '../src/commands';
 
 describe('analsye commands', () => {
-    it('with simple pipeline', (done) => {
+    it('with simple pipeline #1', (done) => {
         const commands = `
             [use]
             plugin = test/locals
@@ -33,7 +33,7 @@ describe('analsye commands', () => {
         assert.equal(commandsAnalysed[2].cmds.length, 2);
         done();
     });
-    it('with simple pipeline', (done) => {
+    it('with simple pipeline #2', (done) => {
         const commands = `
 
             [package:increment]
@@ -56,6 +56,20 @@ describe('analsye commands', () => {
         assert.equal(commandsParsed[3].use, '');
         done();
     });
+    it('with parameters', (done) => {
+        const script = `
+
+            [assign]
+            step = 3
+
+        `;
+        const commandsParsed = ezs.createCommands({ script, prepend: 'transit', append: 'dump?indent=true' });
+        assert.equal(commandsParsed.length, 3);
+        assert.equal(commandsParsed[0].name, 'transit');
+        assert.equal(commandsParsed[1].name, 'assign');
+        assert.equal(commandsParsed[2].name, 'dump');
+        done();
+    });
     it('with nested pipeline', (done) => {
         const commands = `
 
