Switched to exported zod (fixes build issues) + added readMEs for testing

Author: kevinwang5658

package-lock.json

@@ -26,16 +26,15 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^5.3.0",
-    "codify-plugin-lib": "1.0.182-beta31",
+    "codify-plugin-lib": "1.0.182-beta53",
     "codify-schemas": "1.0.86-beta7",
     "debug": "^4.3.4",
     "lodash.isequal": "^4.5.0",
     "nanoid": "^5.0.9",
     "plist": "^3.1.0",
     "semver": "^7.6.0",
     "strip-ansi": "^7.1.0",
-    "trash": "^10.0.0",
-    "zod": "^4.2.1"
+    "trash": "^10.0.0"
   },
   "devDependencies": {
     "@apidevtools/json-schema-ref-parser": "^11.7.2",

package.json

@@ -8,13 +8,16 @@ export default {
   input: 'src/index.ts',
   output: {
     dir:'dist',
-    format: 'cjs'
+    format: 'cjs',
+    inlineDynamicImports: true,
   },
   external: ['@homebridge/node-pty-prebuilt-multiarch'],
   plugins: [
     json(),
     nodeResolve({ exportConditions: ['node'] }),
-    typescript(),
+    typescript({ 
+      exclude: ['**/*.test.ts', '**/*.d.ts', 'test']
+    }),
     commonjs(),
     terser()
   ]

rollup.config.js

@@ -1,14 +1,14 @@
 import { JSONSchema } from '@apidevtools/json-schema-ref-parser';
 import { Ajv } from 'ajv';
+import { VerbosityLevel } from 'codify-plugin-lib';
+import { SequentialPty } from 'codify-plugin-lib/dist/pty/seqeuntial-pty';
 import { IpcMessage, IpcMessageSchema, MessageStatus, ResourceSchema } from 'codify-schemas';
 import mergeJsonSchemas from 'merge-json-schemas';
 import { ChildProcess, fork } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import * as url from 'node:url';
 
-import { codifySpawn } from '../src/utils/codify-spawn.js';
-
 const ajv = new Ajv({
   strict: true
 });
@@ -36,8 +36,11 @@ function sendMessageAndAwaitResponse(process: ChildProcess, message: IpcMessage)
   });
 }
 
-await codifySpawn('rm -rf ./dist')
-await codifySpawn('npm run rollup -- -f es');
+VerbosityLevel.set(3);
+const $ = new SequentialPty();
+
+await $.spawn('rm -rf ./dist')
+await $.spawn('npm run rollup -- -f es', { interactive: true });
 
 const plugin = fork(
   './dist/index.js',
@@ -89,8 +92,8 @@ const mergedSchemas = [...schemasMap.entries()].map(([type, schema]) => {
   });
 
 
-await codifySpawn('rm -rf ./dist')
-await codifySpawn('npm run rollup'); // re-run rollup without building for es
+await $.spawn('rm -rf ./dist')
+await $.spawn('npm run rollup', { interactive: true }); // re-run rollup without building for es
 
 console.log('Generated JSON Schemas for all resources')
 
@@ -100,8 +103,7 @@ fs.writeFileSync(schemaOutputPath, JSON.stringify(mergedSchemas, null, 2));
 
 console.log('Successfully wrote schema to ./dist/schemas.json')
 
-// eslint-disable-next-line n/no-process-exit,unicorn/no-process-exit
-process.exit(0)
-
 
+plugin.kill(9);
+process.exit(0);
 

scripts/build.ts

@@ -0,0 +1,52 @@
+---
+title: android-studio
+description: A reference page for the Android Studios resource
+sidebar:
+  label: android-studio
+---
+
+The Android Studio resource installs Android Studios. It supports the current and all previous versions.
+It also allows preview and beta versions to be installed.
+
+## Parameters:
+
+- **version**: *(string)* The version to install. This will default to the latest stable version if it isn't
+specified. For a list of all available versions please see: https://developer.android.com/studio/archive.
+
+- **directory**: *(string)* A custom directory to install Android Studios to. This defaults to `/Applications`
+if left unspecified
+
+## Example usage:
+
+Stable version:
+```json title="codify.jsonc"
+[
+  {
+    "type": "Android Studio"
+  }
+]
+```
+
+Stable and previous version:
+```json title="codify.jsonc"
+[
+  {
+    "type": "Android Studio"
+  },
+  {
+    "type": "Android Studio",
+    "version": "2024.2.1.8"
+  }
+]
+```
+
+Custom directory:
+```json title="codify.jsonc"
+[
+  {
+    "type": "Android Studio",
+    "version": "2024.2.1.7",
+    "directory": "~/programs"
+  }
+]
+```

src/resources/android/README.md

@@ -1,18 +1,28 @@
-import { CreatePlan, Resource, ResourceSettings, getPty } from 'codify-plugin-lib';
-import { OS, ResourceConfig } from 'codify-schemas';
+import { CreatePlan, Resource, ResourceSettings, getPty, z } from 'codify-plugin-lib';
+import { OS } from 'codify-schemas';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import plist from 'plist';
 
 import { Utils } from '../../utils/index.js';
-import Schema from './android-studio-schema.json';
 import { AndroidStudioPlist, AndroidStudioVersionData } from './types.js';
 
-export interface AndroidStudioConfig extends ResourceConfig {
-  version?: string;
-  directory?: string;
-}
+export const schema = z.object({
+  version: z
+    .string()
+    .describe(
+      'Android studios version. Visit: https://developer.android.com/studio/releases for version info'
+    )
+    .optional(),
+  directory: z
+    .string()
+    .describe(
+      'The directory to install Android Studios into. Defaults to /Applications'
+    )
+    .optional(),
+})
+export type AndroidStudioConfig = z.infer<typeof schema>;
 
 export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
 
@@ -22,7 +32,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
     return {
       id: 'android-studio',
       operatingSystems: [OS.Darwin],
-      schema: Schema,
+      schema,
       parameterSettings: {
         directory: { type: 'directory', default: '/Applications' },
         version: { type: 'version' }
@@ -125,7 +135,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
       const plistData = plist.parse(file) as unknown as AndroidStudioPlist;
 
       return { location, plist: plistData };
-    } catch(error) {
+    } catch (error) {
       console.log(error)
       return null;
     }

src/resources/android/android-studio-schema.json

@@ -5,11 +5,11 @@ import {
   ResourceSettings,
   SpawnStatus,
   getPty,
+  z,
 } from 'codify-plugin-lib';
 import { OS } from 'codify-schemas';
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
-import z from 'zod';
 
 import { FileUtils } from '../../utils/file-utils.js';
 

src/resources/android/android-studio.ts

@@ -1,6 +1,13 @@
-import { CreatePlan, DestroyPlan, Resource, ResourceSettings, SpawnStatus, getPty, untildify } from 'codify-plugin-lib';
+import {
+  CreatePlan,
+  DestroyPlan,
+  Resource,
+  ResourceSettings,
+  SpawnStatus,
+  getPty,
+  z
+} from 'codify-plugin-lib';
 import { OS } from 'codify-schemas';
-import z from 'zod';
 
 import { AsdfPluginVersionsParameter } from './version-parameter.js';
 

src/resources/asdf/asdf-install.ts

@@ -1,9 +1,8 @@
-import { CreatePlan, FileUtils, Resource, ResourceSettings, SpawnStatus, getPty } from 'codify-plugin-lib';
+import { CreatePlan, FileUtils, Resource, ResourceSettings, SpawnStatus, getPty, z } from 'codify-plugin-lib';
 import { OS } from 'codify-schemas';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import z from 'zod';
 
 import { Utils } from '../../utils/index.js';
 import { AsdfPluginsParameter } from './plugins-parameter.js';