@cloud-cli/env 1.2.0 → 1.3.0

package/dist/index.d.ts

@@ -1,6 +1,4 @@
-import { Resource } from '@cloud-cli/store';
-import { init } from '@cloud-cli/cli';
-export declare class EnvEntry extends Resource {
+export declare class EnvEntry {
     app: string;
     key: string;
     value: string;
@@ -9,25 +7,32 @@ export interface App {
     app: string;
     name?: string;
 }
+export interface ListFilters {
+    app?: string;
+    key?: string;
+}
 export interface KeyValue {
     key: string;
     value?: string;
 }
 export interface AppKeyValue extends App, KeyValue {
 }
-declare function reload(): Promise<void>;
 declare function show(options: App): Promise<EnvEntry[]>;
+declare function list(filters?: ListFilters): 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 function setVar(options: AppKeyValue): Promise<{
+    app: string;
+    key: string;
+    value: string;
+}>;
+declare function removeVar(options: AppKeyValue): Promise<boolean>;
+declare function getVar(options: Omit<AppKeyValue, 'value'>): Promise<EnvEntry>;
 declare const _default: {
-    get: typeof get;
-    set: typeof set;
+    get: typeof getVar;
+    set: typeof setVar;
+    remove: typeof removeVar;
     show: typeof show;
-    remove: typeof remove;
     apps: typeof apps;
-    reload: typeof reload;
-    [init]: typeof reload;
+    list: typeof list;
 };
 export default _default;

package/dist/index.js

@@ -1,48 +1,32 @@
-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, SQLiteDriver, Unique } from '@cloud-cli/store';
-import { init } from '@cloud-cli/cli';
+import { getStorage } from '@cloud-cli/cli';
 const appNotSpecifiedError = new Error('App not specified');
 const keyNotSpecifiedError = new Error('Key not specified');
-let EnvEntry = class EnvEntry extends Resource {
-};
-__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);
-export { EnvEntry };
-async function reload() {
-    Resource.use(new SQLiteDriver());
-    await Resource.create(EnvEntry);
+const { get, set, remove, getAll } = getStorage('env');
+export class EnvEntry {
 }
 async function show(options) {
     const app = options.app || options.name;
     if (!app) {
         throw appNotSpecifiedError;
     }
-    return Resource.find(EnvEntry, new Query().where('app').is(app));
+    return list({ app });
+}
+async function list(filters = {}) {
+    let all = await getAll();
+    if (filters.app) {
+        all = all.filter((e) => e.app === filters.app);
+    }
+    if (filters.key) {
+        all = all.filter((e) => e.key === filters.key);
+    }
+    return all;
 }
 async function apps() {
-    const rows = await Resource.find(EnvEntry, new Query());
-    return Array.from(new Set(rows.map(entry => entry.app)));
+    const rows = await getAll();
+    const apps = rows.map((entry) => entry.app);
+    return [...new Set(apps)];
 }
-async function set(options) {
+async function setVar(options) {
     const app = options.app || options.name;
     const { key, value } = options;
     if (!app) {
@@ -51,19 +35,21 @@ async function set(options) {
     if (!key) {
         throw keyNotSpecifiedError;
     }
-    const entry = new EnvEntry({ app, key, value });
-    await entry.save();
+    const entry = { app, key, value };
+    await set(computeId(app, key), entry);
     return entry;
 }
-async function remove(options) {
+async function removeVar(options) {
     const app = options.app || options.name;
     const { key } = options;
-    const found = await get({ app, key });
-    if ((found).length) {
-        return void await found[0].remove();
+    const found = await getVar({ app, key });
+    if (found) {
+        await remove(computeId(app, key));
+        return true;
     }
+    return false;
 }
-async function get(options) {
+async function getVar(options) {
     const app = options.app || options.name;
     const { key } = options;
     if (!app) {
@@ -72,6 +58,17 @@ async function get(options) {
     if (!key) {
         throw keyNotSpecifiedError;
     }
-    return Resource.find(EnvEntry, new Query().where('app').is(app).where('key').is(key));
+    return get(computeId(app, key));
+}
+const invalidRe = /[^a-z09-]/g;
+function computeId(app, key) {
+    return `${app}.${key}`.replace(invalidRe, '-');
 }
-export default { get, set, show, remove, apps, reload, [init]: reload };
+export default {
+    get: getVar,
+    set: setVar,
+    remove: removeVar,
+    show,
+    apps,
+    list,
+};

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@cloud-cli/env",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Storage for app environment variables",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "prettier": "@cloud-cli/prettier-config",
   "scripts": {
-    "test": "jest",
-    "tdd": "jest --watchAll",
+    "test": "vitest",
     "build": "rm -rf ./dist/* && tsc --project ./tsconfig.json"
   },
   "keywords": [
@@ -16,9 +15,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@cloud-cli/jest-config": "^1.0.0",
     "@cloud-cli/prettier-config": "^1.0.0",
-    "@cloud-cli/typescript-config": "^1.0.1"
+    "@cloud-cli/typescript-config": "^1.0.1",
+    "@types/node": "^20.12.8",
+    "typescript": "^5.4.5",
+    "vitest": "^1.6.0"
   },
   "repository": {
     "type": "git",
@@ -28,7 +29,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@cloud-cli/cli": "^1.4.4",
-    "@cloud-cli/store": "^1.5.1"
+    "@cloud-cli/cli": "^1.4.4"
   }
 }