@cloud-cli/env 1.1.0 → 1.1.2

package/dist/index.d.ts

@@ -1,3 +1,10 @@
+import { Resource } from '@cloud-cli/store';
+import { init } from '@cloud-cli/cli';
+declare class EnvEntry extends Resource {
+    app: string;
+    key: string;
+    value: string;
+}
 export interface App {
     app: string;
 }
@@ -7,18 +14,19 @@ export interface KeyValue {
 }
 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 function reload(): Promise<void>;
+declare function show(options: App): Promise<EnvEntry[]>;
+declare function apps(): Promise<string[]>;
+declare function set(options: AppKeyValue): Promise<EnvEntry>;
+declare function remove(options: AppKeyValue): Promise<any>;
+declare function get(options: Omit<AppKeyValue, 'value'>): Promise<EnvEntry[]>;
 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;
+    [init]: typeof reload;
 };
 export default _default;

package/dist/index.js

@@ -1,113 +1,72 @@
-import sqlite from 'sqlite3';
-import { join } from 'path';
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Model, NotNull, Property, Query, Resource, Unique } from '@cloud-cli/store';
+import { init } from '@cloud-cli/cli';
 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',
-    Key: 'key',
-    Value: 'value',
+let EnvEntry = class EnvEntry extends Resource {
 };
-function close() {
-    try {
-        db?.close();
-    }
-    catch { }
-    ;
-}
-function reload() {
-    close();
-    const inMemory = !!process.env.IN_MEMORY_DB;
-    if (inMemory) {
-        sqlite.verbose();
-    }
-    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,
-      ${columns.Key} TEXT,
-      ${columns.Value} TEXT,
-      UNIQUE (${columns.App}, ${columns.Key})
-  )`);
+__decorate([
+    Unique(),
+    NotNull(),
+    Property(String)
+], EnvEntry.prototype, "app", void 0);
+__decorate([
+    Unique(),
+    NotNull(),
+    Property(String)
+], EnvEntry.prototype, "key", void 0);
+__decorate([
+    Property(String)
+], EnvEntry.prototype, "value", void 0);
+EnvEntry = __decorate([
+    Model('env')
+], EnvEntry);
+async function reload() {
+    await Resource.create(EnvEntry);
 }
 async function show(options) {
-    return new Promise((resolve, reject) => {
-        const { app } = options;
-        if (!app) {
-            return reject(appNotSpecifiedError);
-        }
-        db
-            .prepare(`
-        SELECT
-          ${columns.App},
-          ${columns.Key},
-          ${columns.Value}
-        FROM env WHERE
-        ${columns.App} = ?`)
-            .all([app], valueOrError(resolve, reject));
-    });
+    const { app } = options;
+    if (!app) {
+        throw appNotSpecifiedError;
+    }
+    return Resource.find(EnvEntry, new Query().where('app').is(app));
 }
 async function apps() {
-    return new Promise((resolve, reject) => {
-        db
-            .prepare(`SELECT ${columns.App} FROM env`)
-            .all([], valueOrError(resolve, reject));
-    });
+    const rows = await Resource.find(EnvEntry, new Query());
+    return rows.map(entry => entry.app);
 }
 async function set(options) {
     const { app, key, value } = options;
     if (!app) {
-        return Promise.reject(appNotSpecifiedError);
+        throw appNotSpecifiedError;
     }
     if (!key) {
-        return Promise.reject(keyNotSpecifiedError);
+        throw keyNotSpecifiedError;
     }
-    return query('REPLACE INTO env VALUES (?, ?, ?)', [app, key, value]);
+    const entry = new EnvEntry({ app, key, value });
+    await entry.save();
+    return entry;
 }
 async function remove(options) {
+    const { app, key } = options;
+    const found = await get({ app, key });
+    if ((found).length) {
+        return void await found[0].remove();
+    }
+}
+async function get(options) {
     const { app, key } = options;
     if (!app) {
-        return Promise.reject(appNotSpecifiedError);
+        throw appNotSpecifiedError;
     }
     if (!key) {
-        return Promise.reject(keyNotSpecifiedError);
+        throw keyNotSpecifiedError;
     }
-    return query(`DELETE FROM env WHERE ${columns.App} = ? AND ${columns.Key} = ?`, [app, key]);
-}
-async function get(options) {
-    return new Promise((resolve, reject) => {
-        const { app, key } = options;
-        if (!app) {
-            return reject(appNotSpecifiedError);
-        }
-        if (!key) {
-            return reject(keyNotSpecifiedError);
-        }
-        db.serialize(() => {
-            db
-                .prepare(`
-          SELECT
-            ${columns.App},
-            ${columns.Key},
-            ${columns.Value}
-          FROM env WHERE
-            ${columns.App} = ? AND ${columns.Key} = ?`)
-                .all([app, key], valueOrError(resolve, reject));
-        });
-    });
-}
-async function query(statement, inputs) {
-    return new Promise((resolve, reject) => {
-        db.serialize(() => {
-            db
-                .prepare(statement)
-                .run(inputs, valueOrError(resolve, reject));
-        });
-    });
+    return Resource.find(EnvEntry, new Query().where('app').is(app).where('key').is(key));
 }
-export default { reload, show, get, set, delete: remove, apps };
+export default { get, set, show, remove, apps, reload, [init]: reload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/env",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Storage for app environment variables",
   "main": "dist/index.js",
   "type": "module",
@@ -28,6 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "sqlite3": "^5.1.4"
+    "@cloud-cli/cli": "^1.4.4",
+    "@cloud-cli/store": "^1.5.1"
   }
 }

package/.github/workflows/cicd.yml

@@ -1,13 +0,0 @@
-name: CICD
-on:
-  push:
-    branches:
-      - main
-jobs:
-  release:
-    uses: homebots/workflows/.github/workflows/node-build-release.yml@master
-    with:
-      branches: main
-    secrets:
-      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/src/index.spec.js

@@ -1,35 +0,0 @@
-import env from './index';
-
-beforeAll(() => {
-  process.env.IN_MEMORY_DB = true;
-});
-
-const app = { app: 'test' };
-const envVariable = { app: 'test', key: 'key', value: 'ok' };
-
-describe('env', () => {
-  it('should store variables for an app', async () => {
-    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: '', 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.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({ app: '', key: '' })).rejects.toEqual(new Error('App not specified'));
-    await expect(env.delete({ app: 'test', key: '' })).rejects.toEqual(new Error('Key not specified'));
-    await expect(env.delete(envVariable)).resolves.toBeNull();
-    await expect(env.show(app)).resolves.toEqual([]);
-  });
-});

package/src/index.ts

@@ -1,153 +0,0 @@
-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: sqlite.Database;
-
-const columns = {
-  App: 'app',
-  Key: 'key',
-  Value: 'value',
-};
-
-export interface App {
-  app: string;
-}
-
-export interface KeyValue {
-  key: string;
-  value?: string;
-}
-
-export interface AppKeyValue extends App, KeyValue { }
-
-function close() {
-  try {
-    db?.close();
-  } catch { };
-}
-
-function reload() {
-  close();
-
-  const inMemory = !!process.env.IN_MEMORY_DB;
-
-  if (inMemory) {
-    sqlite.verbose();
-  }
-
-  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,
-      ${columns.Key} TEXT,
-      ${columns.Value} TEXT,
-      UNIQUE (${columns.App}, ${columns.Key})
-  )`);
-}
-
-async function show(options: App) {
-  return new Promise((resolve, reject) => {
-    const { app } = options;
-
-    if (!app) {
-      return reject(appNotSpecifiedError);
-    }
-
-    db
-      .prepare(`
-        SELECT
-          ${columns.App},
-          ${columns.Key},
-          ${columns.Value}
-        FROM env WHERE
-        ${columns.App} = ?`
-      )
-      .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: AppKeyValue) {
-  const { app, key, value } = options;
-
-  if (!app) {
-    return Promise.reject(appNotSpecifiedError);
-  }
-
-  if (!key) {
-    return Promise.reject(keyNotSpecifiedError);
-  }
-
-  return query('REPLACE INTO env VALUES (?, ?, ?)', [app, key, value]);
-}
-
-async function remove(options: AppKeyValue) {
-  const { app, key } = options;
-
-  if (!app) {
-    return Promise.reject(appNotSpecifiedError);
-  }
-
-  if (!key) {
-    return Promise.reject(keyNotSpecifiedError);
-  }
-
-  return query(`DELETE FROM env WHERE ${columns.App} = ? AND ${columns.Key} = ?`, [app, key])
-}
-
-async function get(options: Omit<AppKeyValue, 'value'>) {
-  return new Promise((resolve, reject) => {
-    const { app, key } = options;
-
-    if (!app) {
-      return reject(appNotSpecifiedError);
-    }
-
-    if (!key) {
-      return reject(keyNotSpecifiedError);
-    }
-
-    db.serialize(() => {
-      db
-        .prepare(`
-          SELECT
-            ${columns.App},
-            ${columns.Key},
-            ${columns.Value}
-          FROM env WHERE
-            ${columns.App} = ? AND ${columns.Key} = ?`
-        )
-        .all([app, key], valueOrError(resolve, reject));
-    });
-  });
-}
-
-async function query(statement, inputs) {
-  return new Promise((resolve, reject) => {
-    db.serialize(() => {
-      db
-        .prepare(statement)
-        .run(inputs, valueOrError(resolve, reject));
-    });
-  })
-}
-
-
-export default { reload, show, get, set, delete: remove, apps };

package/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "@cloud-cli/typescript-config",
-  "compilerOptions": {
-    "outDir": "./dist",
-  },
-  "include": ["./src/**/*.ts"]
-}