odoro 1.0.6 → 1.0.8

package/dist/build-JFQHODAT.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+export { buildProject, reportBuild } from './chunk-22KJTV2R.js';
+import './chunk-LHZGX5ML.js';
+import './chunk-TQUJ3MFS.js';
+import './chunk-JMEHF3KN.js';

package/dist/{chunk-RZX7T3VG.js → chunk-22KJTV2R.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { extractEntries, fournisseurDe } from './chunk-WPI53RD7.js';
-import { applyAlias, isBareSpecifier } from './chunk-LAMFWJB2.js';
+import { extractEntries, fournisseurDe } from './chunk-LHZGX5ML.js';
+import { applyAlias, isBareSpecifier } from './chunk-TQUJ3MFS.js';
 import { info, colors, size, success, duration } from './chunk-JMEHF3KN.js';
 import { existsSync } from 'fs';
 import { readFile, rm, mkdir, writeFile, cp, stat } from 'fs/promises';

package/dist/{chunk-WPI53RD7.js → chunk-LHZGX5ML.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { depFileName, INTERNAL_PREFIX, DEPS_PREFIX, urlToFile, hasExtension, STYLE_EXTENSIONS, feuilleDemandee, ASSET_EXTENSIONS, wrapAsset, estUneRessource, SOURCE_EXTENSIONS, fileToUrl, transformModule, wrapStyle, applyAlias, isBareSpecifier } from './chunk-LAMFWJB2.js';
-import { info, error, success, duration, colors, warn } from './chunk-JMEHF3KN.js';
+import { depFileName, INTERNAL_PREFIX, DEPS_PREFIX, urlToFile, hasExtension, STYLE_EXTENSIONS, feuilleDemandee, ASSET_EXTENSIONS, wrapAsset, estUneRessource, wrapJson, SOURCE_EXTENSIONS, ecouter, fileToUrl, transformModule, wrapStyle, applyAlias, isBareSpecifier } from './chunk-TQUJ3MFS.js';
+import { info, error, warn, success, duration, colors } from './chunk-JMEHF3KN.js';
 import { existsSync, readFileSync, statSync, watch, createReadStream } from 'fs';
 import { readFile, rm, mkdir, writeFile } from 'fs/promises';
 import { createServer, request } from 'http';
@@ -339,6 +339,20 @@ async function scanDependencies(config, entries) {
   return [...found].sort();
 }
 async function optimizeDeps(config, specifiers, force = false) {
+  try {
+    return await compilerDeps(config, specifiers, force);
+  } catch (cause) {
+    if (!estUneCourse(cause)) throw cause;
+    await new Promise((suite) => setTimeout(suite, DELAI_COURSE));
+    return compilerDeps(config, specifiers, force);
+  }
+}
+var DELAI_COURSE = 400;
+function estUneCourse(cause) {
+  const code = cause?.code;
+  return code === "ENOENT" || code === "EPERM" || code === "EBUSY";
+}
+async function compilerDeps(config, specifiers, force) {
   const directory = join(config.root, "node_modules", ".odoro", "deps");
   const sorted = [...specifiers].sort();
   const hash = createHash("sha256").update(JSON.stringify(sorted)).update(await lockfileFingerprint(config.root)).update(entriesFingerprint(config.root, sorted)).update(engineVersion()).digest("hex").slice(0, 16);
@@ -987,6 +1001,15 @@ async function startDevServer(config) {
             await serveScript(response, file);
             return;
           }
+          if (hasExtension(path, [".json"])) {
+            if (estUneRessource(incoming.headers) || url2.includes("?import")) {
+              const json = await readFile(file, "utf8");
+              send(response, wrapJson(json), MIME[".js"] ?? "text/javascript");
+            } else {
+              serveFile(response, file);
+            }
+            return;
+          }
           serveFile(response, file);
           return;
         }
@@ -1058,11 +1081,11 @@ async function startDevServer(config) {
       }
     }, 40);
   });
-  await new Promise((resolveListen, rejectListen) => {
-    server.once("error", rejectListen);
-    server.listen(config.server.port, config.server.host, resolveListen);
-  });
-  const url = `http://${config.server.host}:${config.server.port}${config.base}`;
+  const { port, demande } = await ecouter(server, config.server.port, config.server.host);
+  if (demande !== void 0) {
+    warn(`port ${String(demande)} occupe \u2014 le serveur ecoute sur ${String(port)}`);
+  }
+  const url = `http://${config.server.host}:${String(port)}${config.base}`;
   success(`pret en ${duration(Date.now() - started)}`);
   info(`  ${colors.cyan(url)}`);
   return {

package/dist/{chunk-LAMFWJB2.js → chunk-TQUJ3MFS.js}

@@ -2,6 +2,38 @@
 import { relative, resolve } from 'path';
 import { build } from 'esbuild';
 
+// src/shared/ecouter.ts
+var ESSAIS = 10;
+async function ecouter(server, port, host, essais = ESSAIS) {
+  for (let decalage = 0; decalage < essais; decalage += 1) {
+    const candidat = port + decalage;
+    const pris = await new Promise((resolve2, reject) => {
+      const surErreur = (cause) => {
+        server.removeListener("listening", surEcoute);
+        if (cause.code === "EADDRINUSE") {
+          resolve2(true);
+          return;
+        }
+        reject(cause);
+      };
+      const surEcoute = () => {
+        server.removeListener("error", surErreur);
+        resolve2(false);
+      };
+      server.once("error", surErreur);
+      server.once("listening", surEcoute);
+      server.listen(candidat, host);
+    });
+    if (!pris) {
+      const adresse = server.address();
+      const obtenu = typeof adresse === "object" && adresse !== null ? adresse.port : candidat;
+      return decalage === 0 ? { port: obtenu } : { port: obtenu, demande: port };
+    }
+  }
+  throw new Error(
+    `[odoro] Aucun port libre entre ${String(port)} et ${String(port + essais - 1)}.`
+  );
+}
 var DEPS_PREFIX = "/@deps/";
 var INTERNAL_PREFIX = "/@odoro/";
 var SOURCE_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
@@ -118,6 +150,73 @@ async function transformModule(file, config, env) {
   }
   return { code, dependencies: [...dependencies] };
 }
+var IDENTIFIANT = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+var RESERVES = /* @__PURE__ */ new Set([
+  "arguments",
+  "await",
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "enum",
+  "eval",
+  "export",
+  "extends",
+  "false",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "implements",
+  "import",
+  "in",
+  "instanceof",
+  "interface",
+  "let",
+  "new",
+  "null",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "return",
+  "static",
+  "super",
+  "switch",
+  "this",
+  "throw",
+  "true",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield"
+]);
+function wrapJson(json) {
+  let valeur;
+  try {
+    valeur = JSON.parse(json);
+  } catch {
+    return 'throw new SyntaxError("JSON illisible")';
+  }
+  const lignes = ["export default " + json.trim()];
+  if (typeof valeur === "object" && valeur !== null && !Array.isArray(valeur)) {
+    for (const [cle, contenu] of Object.entries(valeur)) {
+      if (!IDENTIFIANT.test(cle) || RESERVES.has(cle)) continue;
+      lignes.push("export const " + cle + " = " + JSON.stringify(contenu));
+    }
+  }
+  return lignes.join("\n");
+}
 var DESTINATIONS_RESSOURCE = /* @__PURE__ */ new Set([
   "script",
   "style",
@@ -166,4 +265,4 @@ function wrapAsset(url) {
 `;
 }
 
-export { ASSET_EXTENSIONS, DEPS_PREFIX, INTERNAL_PREFIX, SOURCE_EXTENSIONS, STYLE_EXTENSIONS, applyAlias, depFileName, estUneRessource, feuilleDemandee, fileToUrl, hasExtension, isBareSpecifier, transformModule, urlToFile, wrapAsset, wrapStyle };
+export { ASSET_EXTENSIONS, DEPS_PREFIX, INTERNAL_PREFIX, SOURCE_EXTENSIONS, STYLE_EXTENSIONS, applyAlias, depFileName, ecouter, estUneRessource, feuilleDemandee, fileToUrl, hasExtension, isBareSpecifier, transformModule, urlToFile, wrapAsset, wrapJson, wrapStyle };

package/dist/{chunk-DYMXQBIO.js → chunk-ZVL7EXJO.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { estUneRessource } from './chunk-LAMFWJB2.js';
-import { success, info, colors } from './chunk-JMEHF3KN.js';
+import { estUneRessource, ecouter } from './chunk-TQUJ3MFS.js';
+import { warn, success, info, colors } from './chunk-JMEHF3KN.js';
 import { existsSync, statSync, createReadStream } from 'fs';
 import { createServer } from 'http';
 import { normalize, join, extname } from 'path';
@@ -50,11 +50,11 @@ async function startPreviewServer(config, port = config.server.port + 1) {
     });
     createReadStream(file).pipe(response);
   });
-  await new Promise((done, fail) => {
-    server.once("error", fail);
-    server.listen(port, config.server.host, done);
-  });
-  const url = `http://${config.server.host}:${port}${config.base}`;
+  const { port: obtenu, demande } = await ecouter(server, port, config.server.host);
+  if (demande !== void 0) {
+    warn(`port ${String(demande)} occupe \u2014 l apercu ecoute sur ${String(obtenu)}`);
+  }
+  const url = `http://${config.server.host}:${String(obtenu)}${config.base}`;
   success("previsualisation du build de production");
   info(`  ${colors.cyan(url)}`);
   return {

package/dist/cli.js

@@ -131,7 +131,7 @@ function rootFrom(flags, positional) {
 async function run(argv) {
   const { command, positional, flags } = parseArgs(argv);
   if (flags["version"] === true) {
-    const manifest = await import('./package-QDMDWXNK.js');
+    const manifest = await import('./package-NBP5NDX6.js');
     console.log(manifest.default.version);
     return 0;
   }
@@ -142,7 +142,7 @@ async function run(argv) {
   switch (command) {
     case "create":
     case "new": {
-      const { createCommand } = await import('./create-6FIQWINO.js');
+      const { createCommand } = await import('./create-CDKS7KZ3.js');
       const options = {};
       if (positional[0] !== void 0) options.name = positional[0];
       if (typeof flags["template"] === "string") options.template = flags["template"];
@@ -156,20 +156,20 @@ async function run(argv) {
       return createCommand(options);
     }
     case "dev": {
-      const { startDevServer } = await import('./server-FZU7PFRY.js');
+      const { startDevServer } = await import('./server-4UGN3SFS.js');
       const config = await loadConfig(rootFrom(flags, positional), overridesFrom(flags));
       await startDevServer(config);
       return new Promise(() => void 0);
     }
     case "build": {
-      const { buildProject, reportBuild } = await import('./build-ITT5BYZA.js');
+      const { buildProject, reportBuild } = await import('./build-JFQHODAT.js');
       const config = await loadConfig(rootFrom(flags, positional), overridesFrom(flags));
       const output = await buildProject(config);
       reportBuild(output, process.cwd());
       return 0;
     }
     case "preview": {
-      const { startPreviewServer } = await import('./preview-ALGOUM4N.js');
+      const { startPreviewServer } = await import('./preview-7DKEAQOQ.js');
       const config = await loadConfig(rootFrom(flags, positional), overridesFrom(flags));
       const port = numberFlag(flags, "port");
       await startPreviewServer(config, port);

package/dist/{create-6FIQWINO.js → create-CDKS7KZ3.js}

@@ -148,8 +148,8 @@ var VERSIONS_FAMILLE = {
   "@odoro-cli/icons": "1.0.2",
   "@odoro-cli/libs": "1.0.2",
   "@odoro-cli/server": "1.0.2",
-  "create-odoro": "1.0.6",
-  "odoro": "1.0.6"
+  "create-odoro": "1.0.8",
+  "odoro": "1.0.8"
 };
 
 // src/scaffold/scaffold.ts

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-export { startPreviewServer } from './chunk-DYMXQBIO.js';
+export { startPreviewServer } from './chunk-ZVL7EXJO.js';
 export { defineConfig, loadConfig } from './chunk-DL3NPC4H.js';
 import './chunk-T6RLHSCW.js';
-export { buildProject, reportBuild } from './chunk-RZX7T3VG.js';
-export { ModuleGraph, detectSelfAccepting, optimizeDeps, scanDependencies, startDevServer } from './chunk-WPI53RD7.js';
-export { depFileName } from './chunk-LAMFWJB2.js';
+export { buildProject, reportBuild } from './chunk-22KJTV2R.js';
+export { ModuleGraph, detectSelfAccepting, optimizeDeps, scanDependencies, startDevServer } from './chunk-LHZGX5ML.js';
+export { depFileName } from './chunk-TQUJ3MFS.js';
 import './chunk-JMEHF3KN.js';

package/dist/{package-QDMDWXNK.js → package-NBP5NDX6.js}

@@ -2,7 +2,7 @@
 // package.json
 var package_default = {
   name: "odoro",
-  version: "1.0.6",
+  version: "1.0.8",
   type: "module",
   license: "UNLICENSED",
   author: "BouBouw",

package/dist/preview-7DKEAQOQ.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+export { startPreviewServer } from './chunk-ZVL7EXJO.js';
+import './chunk-TQUJ3MFS.js';
+import './chunk-JMEHF3KN.js';

package/dist/{server-FZU7PFRY.js → server-4UGN3SFS.js}

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-export { extractEntries, injectClient, startDevServer } from './chunk-WPI53RD7.js';
-import './chunk-LAMFWJB2.js';
+export { extractEntries, injectClient, startDevServer } from './chunk-LHZGX5ML.js';
+import './chunk-TQUJ3MFS.js';
 import './chunk-JMEHF3KN.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odoro",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "license": "UNLICENSED",
   "author": "BouBouw",

package/dist/build-ITT5BYZA.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-export { buildProject, reportBuild } from './chunk-RZX7T3VG.js';
-import './chunk-WPI53RD7.js';
-import './chunk-LAMFWJB2.js';
-import './chunk-JMEHF3KN.js';

package/dist/preview-ALGOUM4N.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-export { startPreviewServer } from './chunk-DYMXQBIO.js';
-import './chunk-LAMFWJB2.js';
-import './chunk-JMEHF3KN.js';