@eighty4/c2 0.0.2-12 → 0.0.2-25

package/README.md

@@ -30,7 +30,7 @@ const userData: string = await buildUserData('./cloud_init_dir')
 
 ## Cloud Config data dir
 
-Multiple user data are ordered by filenames and `01_` numbered prefixes help declaring execution order.
+Multiple user data are ordered by filenames and `01_` numbered prefixes help declare execution order.
 
 ```
 ls ./cloud_init_dir

package/lib/attachments.spec.ts

@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, expect, test } from 'bun:test'
 import { join } from 'node:path'
-import { collectAttachments } from '#c2/attachments.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { collectAttachments } from './attachments.ts'
+import { makeFile, makeTempDir, removeDir } from './fs.testing.ts'
 
 let tmpDir: string
 

package/lib/attachments.ts

@@ -1,4 +1,4 @@
-import { readDirListing, readToString } from '#c2/fs.ts'
+import { readDirListing, readToString } from './fs.ts'
 
 export type AttachmentType = 'cloud-config' | 'x-shellscript'
 

package/lib/build.spec.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, expect, test } from 'bun:test'
-import { buildUserData } from '#c2/build.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { buildUserData } from './build.ts'
+import { makeFile, makeTempDir, removeDir } from './fs.testing.ts'
 
 let tmpDir: string
 

package/lib/build.ts

@@ -1,6 +1,6 @@
-import { type Attachment, collectAttachments } from '#c2/attachments.ts'
-import { evalTemplateExpressions } from '#c2/expression.ts'
-import { readToString } from '#c2/fs.ts'
+import { type Attachment, collectAttachments } from './attachments.ts'
+import { evalTemplateExpressions } from './expression.ts'
+import { readToString } from './fs.ts'
 
 export type BuildUserDataOpts = {
     attachmentBoundary?: string

package/lib/c2.api.ts

@@ -1 +1 @@
-export { type BuildUserDataOpts, buildUserData } from '#c2/build.ts'
+export { type BuildUserDataOpts, buildUserData } from './build.ts'

package/lib/c2.bin.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { buildUserData } from '#c2/build.ts'
-import { parseArgs, type ParsedArgs } from '#c2/cli.ts'
-import { doesDirExist } from '#c2/fs.ts'
+import { buildUserData } from './build.ts'
+import { parseArgs, type ParsedArgs } from './cli.ts'
+import { doesDirExist } from './fs.ts'
 
 let args: ParsedArgs | undefined
 try {

package/lib/cli.spec.ts

@@ -1,11 +1,11 @@
 import { expect, test } from 'bun:test'
-import { parseArgs } from '#c2/cli.ts'
+import { parseArgs } from './cli.ts'
 
 test('parseArgs', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/c2.bin.ts',
             'user_data_dir',
         ]),
     ).toStrictEqual({
@@ -16,7 +16,10 @@ test('parseArgs', () => {
 
 test('parseArgs errors without USER_DATA_DIR', () => {
     expect(() =>
-        parseArgs(['/Users/who/.bun/bin/bun', '/Users/who/user-data/c2.ts']),
+        parseArgs([
+            '/Users/who/.bun/bin/bun',
+            '/Users/who/user-data/c2.bin.ts',
+        ]),
     ).toThrow()
 })
 
@@ -24,7 +27,7 @@ test('parseArgs errors with extra USER_DATA_DIR', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/c2.bin.ts',
             'user_data_dir',
             'some_other_arg',
         ]),
@@ -35,7 +38,7 @@ test('parseArgs with --base64', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/c2.bin.ts',
             '--base64',
             'user_data_dir',
         ]),
@@ -49,7 +52,7 @@ test('parseArgs with --http PORT', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/c2.bin.ts',
             '--http',
             '6666',
             'user_data_dir',
@@ -61,7 +64,7 @@ test('parseArgs with --http bunk', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/c2.bin.ts',
             '--http',
             'bunk',
             'user_data_dir',

package/lib/cli.ts

@@ -12,7 +12,12 @@ export function parseArgs(args?: Array<string>): ParsedArgs {
         args = process.argv
     }
     args = [...args]
-    while (!args.shift()!.endsWith('/c2.ts')) {}
+    let shifted
+    while ((shifted = args.shift())) {
+        if (shifted.endsWith('/c2.bin.js') || shifted.endsWith('/c2.bin.ts')) {
+            break
+        }
+    }
     let base64 = false
     let httpPort: number | undefined
     let userData: Array<string> = []

package/lib/expression.spec.ts

@@ -1,7 +1,7 @@
 import { afterAll, afterEach, beforeEach, expect, test } from 'bun:test'
 import { join } from 'node:path'
-import { evalTemplateExpressions } from '#c2/expression.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { evalTemplateExpressions } from './expression.ts'
+import { makeFile, makeTempDir, removeDir } from './fs.testing.ts'
 
 let files: Array<string> = []
 let tmpDir: string

package/lib/expression.ts

@@ -1,5 +1,5 @@
 import MagicString from 'magic-string'
-import { readToString } from '#c2/fs.ts'
+import { readToString } from './fs.ts'
 
 type TemplateExpression = {
     index: number

package/lib_js/attachments.js

@@ -1,4 +1,4 @@
-import { readDirListing, readToString } from '#c2/fs.ts';
+import { readDirListing, readToString } from "./fs.js";
 export async function collectAttachments(dir) {
     const result = [];
     for (const filename of await readDirListing(dir)) {

package/lib_js/build.js

@@ -1,6 +1,6 @@
-import { collectAttachments } from '#c2/attachments.ts';
-import { evalTemplateExpressions } from '#c2/expression.ts';
-import { readToString } from '#c2/fs.ts';
+import { collectAttachments } from "./attachments.js";
+import { evalTemplateExpressions } from "./expression.js";
+import { readToString } from "./fs.js";
 export async function buildUserData(userDataDir, opts) {
     const attachments = await collectAttachments(userDataDir);
     switch (attachments.length) {

package/lib_js/c2.api.js

@@ -1 +1 @@
-export { buildUserData } from '#c2/build.ts';
+export { buildUserData } from "./build.js";

package/lib_js/c2.bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { buildUserData } from '#c2/build.ts';
-import { parseArgs } from '#c2/cli.ts';
-import { doesDirExist } from '#c2/fs.ts';
+import { buildUserData } from "./build.js";
+import { parseArgs } from "./cli.js";
+import { doesDirExist } from "./fs.js";
 let args;
 try {
     args = parseArgs();

package/lib_js/cli.js

@@ -3,7 +3,12 @@ export function parseArgs(args) {
         args = process.argv;
     }
     args = [...args];
-    while (!args.shift().endsWith('/c2.ts')) { }
+    let shifted;
+    while ((shifted = args.shift())) {
+        if (shifted.endsWith('/c2.bin.js') || shifted.endsWith('/c2.bin.ts')) {
+            break;
+        }
+    }
     let base64 = false;
     let httpPort;
     let userData = [];

package/lib_js/expression.js

@@ -1,5 +1,5 @@
 import MagicString from 'magic-string';
-import { readToString } from '#c2/fs.ts';
+import { readToString } from "./fs.js";
 export async function evalTemplateExpressions(content) {
     const regex = new RegExp(/\${{\s*(.*)\s*}}/g);
     let match;

package/lib_types/c2.api.d.ts

@@ -1,2 +1,2 @@
-export { type BuildUserDataOpts, buildUserData } from '#c2/build.ts';
+export { type BuildUserDataOpts, buildUserData } from './build.ts';
 //# sourceMappingURL=c2.api.d.ts.map

package/lib_types/c2.api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"c2.api.d.ts","sourceRoot":"","sources":["../lib/c2.api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA"}
+{"version":3,"file":"c2.api.d.ts","sourceRoot":"","sources":["../lib/c2.api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA"}

package/lib_types/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAEP,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAsC1D"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAEP,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CA2C1D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/c2",
-  "version": "0.0.2-12",
+  "version": "0.0.2-25",
   "author": "Adam McKee <adam.be.g84d@gmail.com>",
   "repository": "https://github.com/eighty4/c2",
   "homepage": "https://github.com/eighty4/c2",
@@ -23,10 +23,6 @@
     "c2": "./lib_js/c2.bin.js"
   },
   "main": "./lib_js/c2.api.js",
-  "imports": {
-    "#c2/*.js": "./lib_js/*.js",
-    "#c2/*.ts": "./lib/*.ts"
-  },
   "types": "./lib_types",
   "scripts": {
     "build": "tsc",