wirejs-deploy-amplify-basic 0.0.15-alpha → 0.0.17-alpha

package/amplify-backend-assets/functions/api/handler.ts

@@ -1,6 +1,8 @@
 import { env } from 'process';
 import { LambdaFunctionURLHandler, APIGatewayProxyEventV2 } from 'aws-lambda';
 import { CookieJar, Context, requiresContext } from 'wirejs-resources';
+
+// @ts-ignore
 import * as api from '../../../api/index';
 
 function createContext(event: APIGatewayProxyEventV2) {

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.0",
 		"wirejs-dom": "^1.0.34",
-		"wirejs-resources": "^0.1.6-alpha"
+		"wirejs-resources": "^0.1.8-alpha"
 	}
 }

package/build.js

@@ -12,9 +12,6 @@ const CWD = process.cwd();
 const __filename = import.meta.url.replace(/^file:/, '');
 const SELF_DIR = path.dirname(__filename);
 const TEMP_DIR = path.join(SELF_DIR, 'temp');
-const RESOURCE_OVERRIDES_BUILD = path.join(
-	TEMP_DIR, 'wirejs-resource-overrides.build.js'
-);
 const PROJECT_API_DIR = path.join(CWD, 'api');
 const PROJECT_DIST_DIR = path.join(CWD, 'dist');
 const BACKEND_DIR = path.join(CWD, 'amplify');
@@ -64,7 +61,7 @@ async function installDeps() {
 			'esbuild': '^0.24.2',
 			'tsx': '^4.19.2',
 			'typescript': '^5.7.3',
-			'@aws-sdk/client-s3': "^3.735.0",
+			'wirejs-resources': `file:${SELF_DIR}`
 		}
 	};
 	await fs.promises.writeFile(
@@ -89,7 +86,7 @@ async function buildApiBundle() {
 	// looks like cruft at the moment, but we'll see ...
 	// await import(path.join(PROJECT_API_DIR, 'index.js'));
 
-	const outputPath = path.join(PROJECT_DIST_DIR, 'api', 'dist', 'index.js');
+	const outputPath = path.join(BACKEND_DIR, 'api.js');
 
 	// intermediate build of the resource overrides. this includes any deps we have
 	// on the original `wirejs-resources` into the intermediate bundle. doing this
@@ -102,6 +99,7 @@ async function buildApiBundle() {
 		outfile: RESOURCE_OVERRIDES_BUILD,
 		platform: 'node',
 		format: 'esm',
+		external: ['@aws-sdk/client-s3']
 	});
 
 	// exploratory build. builds using our overrides, which will emit a manifest of
@@ -115,7 +113,8 @@ async function buildApiBundle() {
 		format: 'esm',
 		alias: {
 			'wirejs-resources': RESOURCE_OVERRIDES_BUILD
-		}
+		},
+		external: ['@aws-sdk/client-s3']
 	});
 
 	// exploratory import. not strictly necessary until we're actually using the manifest
@@ -148,7 +147,8 @@ if (action === 'prebuild') {
 	console.log("starting prebuild");
 	await createSkeleton();
 	await installDeps();
-	await buildApiBundle();
+	// await buildApiBundle();
+
 	console.log("prebuild done");
 } else if (action === 'inject-backend') {
 	console.log("starting inject-backend");

package/dist/index.d.ts

@@ -0,0 +1,14 @@
+import { Resource } from 'wirejs-resources';
+export { AuthenticationService, withContext, requiresContext, Context, CookieJar, Resource, overrides, } from 'wirejs-resources';
+export declare class FileService extends Resource {
+    constructor(scope: Resource | string, id: string);
+    read(filename: string, encoding?: BufferEncoding): Promise<string>;
+    write(filename: string, data: string, { onlyIfNotExists }?: {
+        onlyIfNotExists?: boolean | undefined;
+    }): Promise<void>;
+    delete(filename: string): Promise<void>;
+    list({ prefix }?: {
+        prefix?: string | undefined;
+    }): AsyncGenerator<string | undefined, void, unknown>;
+    isAlreadyExistsError(error: any): boolean;
+}

package/dist/index.js

@@ -0,0 +1,70 @@
+import { env } from 'process';
+import { S3Client, ListObjectsCommand, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from '@aws-sdk/client-s3';
+import { overrides, Resource, } from 'wirejs-resources';
+export { AuthenticationService, withContext, requiresContext, Context, CookieJar, Resource, overrides, } from 'wirejs-resources';
+const Bucket = env['BUCKET'];
+const s3 = new S3Client();
+export class FileService extends Resource {
+    constructor(scope, id) {
+        super(scope, id);
+        addResource('FileService', { absoluteId: this.absoluteId });
+    }
+    async read(filename, encoding = 'utf8') {
+        const Key = `${this.absoluteId}/${filename}`;
+        const command = new GetObjectCommand({ Bucket, Key });
+        const result = await s3.send(command);
+        return result.Body.transformToString(encoding);
+    }
+    async write(filename, data, { onlyIfNotExists = false } = {}) {
+        const Key = `${this.absoluteId}/${filename}`;
+        const Body = data;
+        const commandDetails = {
+            Bucket, Key, Body
+        };
+        if (onlyIfNotExists) {
+            commandDetails['IfNoneMatch'] = '*';
+        }
+        const command = new PutObjectCommand(commandDetails);
+        await s3.send(command);
+    }
+    async delete(filename) {
+        const Key = `${this.absoluteId}/${filename}`;
+        const command = new DeleteObjectCommand({
+            Bucket,
+            Key
+        });
+        await s3.send(command);
+    }
+    async *list({ prefix = '' } = {}) {
+        const Prefix = `${this.absoluteId}/${prefix}`;
+        let Marker = undefined;
+        while (true) {
+            const command = new ListObjectsCommand({
+                Bucket,
+                Prefix,
+                MaxKeys: 1000,
+                Marker
+            });
+            const result = await s3.send(command);
+            Marker = result.Marker;
+            for (const o of result.Contents || []) {
+                yield o.Key;
+            }
+            if (!Marker)
+                break;
+        }
+    }
+    isAlreadyExistsError(error) {
+        // https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+        return error?.$metadata?.httpStatusCode === 412;
+    }
+}
+// expose resources to other resources that might depend on it.
+overrides.FileService = FileService;
+globalThis.wirejsResources = [];
+function addResource(type, options) {
+    globalThis.wirejsResources.push({
+        type,
+        options
+    });
+}

package/package.json

@@ -1,9 +1,11 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.15-alpha",
+	"version": "0.0.17-alpha",
 	"type": "module",
+	"main": "./dist/index.js",
+	"types": "./dist/index.d.ts",
 	"bin": {
-		"wirejs-deploy-amplify-basic": "./build.js"
+		"wirejs-deploy-amplify-basic": "build.js"
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "^3.738.0",
@@ -16,6 +18,17 @@
 		"wirejs-resources": "^0.1.8-alpha"
 	},
 	"devDependencies": {
-		"@aws-amplify/backend": "^1.14.0"
-	}
+		"@aws-amplify/backend": "^1.14.0",
+		"typescript": "^5.7.3"
+	},
+	"scripts": {
+		"build": "tsc"
+	},
+	"files": [
+		"amplify-backend-assets/*",
+		"amplify-hosting-assets/*",
+		"dist/*",
+		"build.js",
+		"package.json"
+	]
 }