dxfl 0.1.2 → 0.1.3

package/deploy.ts

@@ -9,8 +9,8 @@ import {
   DeleteObjectsCommandOutput,
 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import { openApiConf } from "./auth";
-import Pool from "@supercharge/promise-pool";
+import { PromisePool } from "@supercharge/promise-pool";
+import { openApiConf } from "./auth.js";
 
 // Walks through the local directory at path `dir`, and for each file it contains, returns :
 // - `localPath`: its path on the local filesystem (includes `dir`). On windows, this path
@@ -145,7 +145,7 @@ export async function deploy(vhost: string, localFolder: string) {
   }
 
   // Control concurrence while uploading
-  await Pool
+  await PromisePool
    .for(localFiles)
    .withConcurrency(6)
    .process(({ localPath, s3Path }) => uploadFile(s3client, Bucket, s3Path,fs.createReadStream(localPath)));

package/dist/auth.d.ts

@@ -0,0 +1,3 @@
+import { Configuration } from "guichet-sdk-ts";
+export declare function openApiConf(): Promise<Configuration>;
+export declare function login(username: string): Promise<void>;

package/dist/deploy.d.ts

@@ -0,0 +1 @@
+export declare function deploy(vhost: string, localFolder: string): Promise<void>;

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/index.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+import { program } from "commander";
+import { login } from "./auth.js";
+import { deploy } from "./deploy.js";
+import { vhostsList } from "./vhosts.js";
+program
+    .name('dxfl')
+    .description('Deuxfleurs CLI tool')
+    .version('0.1.0');
+program.command('login')
+    .description('Link your Deuxfleurs account with this tool.')
+    .argument('<username>', 'your account username')
+    .action(login);
+program.command('list')
+    .description('List all your websites')
+    .action(vhostsList);
+program.command('deploy')
+    .description('Deploy your website')
+    .argument('<vhost>', 'selected vhost')
+    .argument('<local_folder>', 'your local folder')
+    .action(deploy);
+program.parse();

package/dist/vhosts.d.ts

@@ -0,0 +1 @@
+export declare function vhostsList(): Promise<void>;

package/index.ts

@@ -1,7 +1,8 @@
+#!/usr/bin/env node
 import { program } from "commander";
-import { login } from "./auth";
-import { deploy } from "./deploy";
-import { vhostsList } from "./vhosts";
+import { login } from "./auth.js";
+import { deploy } from "./deploy.js";
+import { vhostsList } from "./vhosts.js";
 
 program
   .name('dxfl')

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "dxfl",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
-  "type": "commonjs",
-  "main": "bootstrap.js",
+  "type": "module",
+  "main": "dist/main.js",
   "bin": {
-    "dxfl": "./bootstrap.js"
+    "dxfl": "./dist/index.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "prepare": "npx tsc"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.750.0",
@@ -18,9 +18,9 @@
     "@supercharge/promise-pool": "^3.2.0",
     "@types/node": "^22.13.5",
     "commander": "^13.1.0",
-    "guichet-sdk-ts": "git+https://git.deuxfleurs.fr/Deuxfleurs/guichet-sdk-ts",
+    "guichet-sdk-ts": "^0.1.0",
     "mime": "^4.0.6",
     "read": "^4.1.0",
-    "tsx": "^4.19.3"
+    "typescript": "^5.7.3"
   }
 }

package/tsconfig.json

@@ -12,7 +12,7 @@
 
     /* Language and Environment */
     "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "lib": [ "es6" ],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -25,13 +25,15 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "nodenext",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    //"moduleResolution": "node",                               /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    "typeRoots": [
+      "node_modules/@types"
+    ],                                  /* Specify multiple folders that act like './node_modules/@types'. */
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
@@ -51,14 +53,14 @@
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 
     /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
     // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "dist",                                      /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
@@ -107,5 +109,9 @@
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
 }

package/vhosts.ts

@@ -1,5 +1,5 @@
 import { Configuration, WebsiteApi } from "guichet-sdk-ts";
-import { openApiConf } from "./auth";
+import { openApiConf } from "./auth.js";
 
 export async function vhostsList() {
   const conf = await openApiConf();

package/bootstrap.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-require('tsx/cjs')
-require('./index.ts')