@cloud-cli/env 1.0.0 → 1.1.1

package/README.md

@@ -1,3 +1,20 @@
 # env
 
 Storage for app environment variables
+
+## Usage
+
+`cloudy.conf.mjs`:
+```ts
+import env from '@cloud-cli/env'
+export default { env };
+```
+
+```bash
+cy env.reload
+cy env.set --app test --key key --value 123
+cy env.apps
+cy env.show --app test
+cy env.get --app test --key key
+cy env.delete --app test --key key
+```

package/dist/index.d.ts

@@ -9,14 +9,16 @@ export interface AppKeyValue extends App, KeyValue {
 }
 declare function reload(): void;
 declare function show(options: App): Promise<unknown>;
+declare function apps(): Promise<unknown>;
 declare function set(options: AppKeyValue): Promise<unknown>;
 declare function remove(options: AppKeyValue): Promise<unknown>;
 declare function get(options: Omit<AppKeyValue, 'value'>): Promise<unknown>;
 declare const _default: {
-    reload: typeof reload;
-    show: typeof show;
     get: typeof get;
     set: typeof set;
-    delete: typeof remove;
+    show: typeof show;
+    remove: typeof remove;
+    apps: typeof apps;
+    reload: typeof reload;
 };
 export default _default;

package/dist/index.js

@@ -2,6 +2,8 @@ import sqlite from 'sqlite3';
 import { join } from 'path';
 const appNotSpecifiedError = new Error('App not specified');
 const keyNotSpecifiedError = new Error('Key not specified');
+/* istanbul ignore next */
+const valueOrError = (resolve, reject) => (error, value = null) => error ? reject(error) : resolve(value);
 let db;
 const columns = {
     App: 'app',
@@ -10,9 +12,7 @@ const columns = {
 };
 function close() {
     try {
-        if (db) {
-            db.close();
-        }
+        db?.close();
     }
     catch { }
     ;
@@ -23,7 +23,10 @@ function reload() {
     if (inMemory) {
         sqlite.verbose();
     }
-    const databasePath = inMemory ? ':memory:' : join(process.cwd(), 'env.db');
+    const databasePath = {
+        true: ':memory:',
+        false: join(process.cwd(), 'env.db')
+    }[String(inMemory)];
     db = new sqlite.Database(databasePath);
     db.run(`CREATE TABLE IF NOT EXISTS env (
       ${columns.App} TEXT,
@@ -46,7 +49,14 @@ async function show(options) {
           ${columns.Value}
         FROM env WHERE
         ${columns.App} = ?`)
-            .all([app], (error, rows) => error ? reject(error) : resolve(rows));
+            .all([app], valueOrError(resolve, reject));
+    });
+}
+async function apps() {
+    return new Promise((resolve, reject) => {
+        db
+            .prepare(`SELECT ${columns.App} FROM env`)
+            .all([], valueOrError(resolve, reject));
     });
 }
 async function set(options) {
@@ -87,7 +97,7 @@ async function get(options) {
             ${columns.Value}
           FROM env WHERE
             ${columns.App} = ? AND ${columns.Key} = ?`)
-                .all([app, key], (error, rows) => (error ? reject(error) : resolve(rows[0])));
+                .all([app, key], valueOrError(resolve, reject));
         });
     });
 }
@@ -96,9 +106,8 @@ async function query(statement, inputs) {
         db.serialize(() => {
             db
                 .prepare(statement)
-                .run(inputs)
-                .finalize((error) => (error ? reject(error) : resolve(null)));
+                .run(inputs, valueOrError(resolve, reject));
         });
     });
 }
-export default { reload, show, get, set, delete: remove };
+export default { get, set, show, remove, apps, reload };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@cloud-cli/env",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Storage for app environment variables",
   "main": "dist/index.js",
   "type": "module",
   "types": "./dist/index.d.ts",
+  "prettier": "@cloud-cli/prettier-config",
   "scripts": {
     "test": "jest",
     "tdd": "jest --watchAll",
@@ -15,18 +16,9 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.21.0",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.21.0",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^14.18.21",
-    "babel-jest": "^29.4.3",
-    "jest": "^29.4.3",
-    "nodemon": "^2.0.16",
-    "ts-jest": "^29.0.5",
-    "ts-jest-resolver": "^2.0.0",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.8.2"
+    "@cloud-cli/jest-config": "^1.0.0",
+    "@cloud-cli/prettier-config": "^1.0.0",
+    "@cloud-cli/typescript-config": "^1.0.1"
   },
   "repository": {
     "type": "git",

package/src/index.spec.js

@@ -12,17 +12,24 @@ describe('env', () => {
     env.reload();
     await expect(env.set({ app: '', key: '' })).rejects.toEqual(new Error('App not specified'));
     await expect(env.set({ app: 'test', key: '' })).rejects.toEqual(new Error('Key not specified'));
-    await expect(env.get({ app: 'test', key: 'key' })).resolves.toEqual(undefined);
+
+    await expect(env.get({ app: '', key: '' })).rejects.toEqual(new Error('App not specified'));
+    await expect(env.get({ app: 'test', key: '' })).rejects.toEqual(new Error('Key not specified'));
+    await expect(env.get({ app: 'test', key: 'key' })).resolves.toEqual([]);
 
     // upsert
     await expect(env.set(envVariable)).resolves.toBeNull();
     await expect(env.set(envVariable)).resolves.toBeNull();
 
-    await expect(env.get({ app: 'test', key: 'key' })).resolves.toEqual(envVariable);
+    await expect(env.get({ app: 'test', key: 'key' })).resolves.toEqual([envVariable]);
 
+    await expect(env.show({ app: '' })).rejects.toEqual(new Error('App not specified'));
     await expect(env.show(app)).resolves.toEqual([envVariable]);
+    await expect(env.apps()).resolves.toEqual([{ app: 'test' }]);
 
-    await expect(env.delete(envVariable)).resolves.toBeNull();
+    await expect(env.remove({ app: '', key: '' })).rejects.toEqual(new Error('App not specified'));
+    await expect(env.remove({ app: 'test', key: '' })).rejects.toEqual(new Error('Key not specified'));
+    await expect(env.remove(envVariable)).resolves.toBeNull();
     await expect(env.show(app)).resolves.toEqual([]);
   });
 });

package/src/index.ts

@@ -3,6 +3,10 @@ import { join } from 'path';
 
 const appNotSpecifiedError = new Error('App not specified');
 const keyNotSpecifiedError = new Error('Key not specified');
+
+/* istanbul ignore next */
+const valueOrError = (resolve, reject) => (error, value = null) => error ? reject(error) : resolve(value)
+
 let db: sqlite.Database;
 
 const columns = {
@@ -24,9 +28,7 @@ export interface AppKeyValue extends App, KeyValue { }
 
 function close() {
   try {
-    if (db) {
-      db.close();
-    }
+    db?.close();
   } catch { };
 }
 
@@ -39,7 +41,10 @@ function reload() {
     sqlite.verbose();
   }
 
-  const databasePath = inMemory ? ':memory:' : join(process.cwd(), 'env.db');
+  const databasePath = {
+    true: ':memory:',
+    false: join(process.cwd(), 'env.db')
+  }[String(inMemory)];
 
   db = new sqlite.Database(databasePath);
   db.run(`CREATE TABLE IF NOT EXISTS env (
@@ -67,7 +72,15 @@ async function show(options: App) {
         FROM env WHERE
         ${columns.App} = ?`
       )
-      .all([app], (error, rows) => error ? reject(error) : resolve(rows));
+      .all([app], valueOrError(resolve, reject));
+  });
+}
+
+async function apps() {
+  return new Promise((resolve, reject) => {
+    db
+      .prepare(`SELECT ${columns.App} FROM env`)
+      .all([], valueOrError(resolve, reject));
   });
 }
 
@@ -121,7 +134,7 @@ async function get(options: Omit<AppKeyValue, 'value'>) {
           FROM env WHERE
             ${columns.App} = ? AND ${columns.Key} = ?`
         )
-        .all([app, key], (error, rows) => (error ? reject(error) : resolve(rows[0])));
+        .all([app, key], valueOrError(resolve, reject));
     });
   });
 }
@@ -131,10 +144,10 @@ async function query(statement, inputs) {
     db.serialize(() => {
       db
         .prepare(statement)
-        .run(inputs)
-        .finalize((error) => (error ? reject(error) : resolve(null)));
+        .run(inputs, valueOrError(resolve, reject));
     });
   })
 }
 
-export default { reload, show, get, set, delete: remove };
+
+export default { get, set, show, remove, apps, reload };

package/tsconfig.json

@@ -1,14 +1,7 @@
 {
+  "extends": "@cloud-cli/typescript-config",
   "compilerOptions": {
-    "moduleResolution": "node",
-    "module": "esnext",
-    "target": "es2020",
-    "lib": ["ESNext"],
-    "esModuleInterop": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
     "outDir": "./dist",
-    "declaration": true
   },
   "include": ["./src/**/*.ts"]
 }