@shivaedev/create-app 0.36.0 → 0.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +57 -0
- package/README.md +23 -0
- package/dist/addResource.d.ts +4 -0
- package/dist/addResource.d.ts.map +1 -0
- package/dist/addResource.js +45 -0
- package/dist/addResource.js.map +1 -0
- package/dist/cli.js +316 -78
- package/dist/packTemplate.js +2 -2
- package/dist/packTemplate.js.map +1 -1
- package/dist/resource/contract.d.ts +3 -0
- package/dist/resource/contract.d.ts.map +1 -0
- package/dist/resource/contract.js +37 -0
- package/dist/resource/contract.js.map +1 -0
- package/dist/resource/files.d.ts +5 -0
- package/dist/resource/files.d.ts.map +1 -0
- package/dist/resource/files.js +18 -0
- package/dist/resource/files.js.map +1 -0
- package/dist/resource/kit.d.ts +4 -0
- package/dist/resource/kit.d.ts.map +1 -0
- package/dist/resource/kit.js +107 -0
- package/dist/resource/kit.js.map +1 -0
- package/dist/resource/names.d.ts +10 -0
- package/dist/resource/names.d.ts.map +1 -0
- package/dist/resource/names.js +11 -0
- package/dist/resource/names.js.map +1 -0
- package/dist/resource/persistence.d.ts +5 -0
- package/dist/resource/persistence.d.ts.map +1 -0
- package/dist/resource/persistence.js +64 -0
- package/dist/resource/persistence.js.map +1 -0
- package/dist/resource/registration.d.ts +4 -0
- package/dist/resource/registration.d.ts.map +1 -0
- package/dist/resource/registration.js +46 -0
- package/dist/resource/registration.js.map +1 -0
- package/dist/runProcess.d.ts +3 -3
- package/dist/runProcess.d.ts.map +1 -1
- package/dist/runProcess.js +6 -5
- package/dist/runProcess.js.map +1 -1
- package/dist/starterPatch.d.ts +4 -0
- package/dist/starterPatch.d.ts.map +1 -1
- package/dist/starterPatch.js +17 -5
- package/dist/starterPatch.js.map +1 -1
- package/dist/template.d.ts +2 -0
- package/dist/template.d.ts.map +1 -1
- package/dist/template.js +14 -3
- package/dist/template.js.map +1 -1
- package/dist/updateApp.d.ts +1 -1
- package/dist/updateApp.d.ts.map +1 -1
- package/dist/updateApp.js +23 -15
- package/dist/updateApp.js.map +1 -1
- package/dist/updateChecks.d.ts +1 -1
- package/dist/updateChecks.d.ts.map +1 -1
- package/dist/updateChecks.js +6 -3
- package/dist/updateChecks.js.map +1 -1
- package/package.json +4 -4
- package/src/addResource.ts +45 -0
- package/src/cli.ts +9 -2
- package/src/packTemplate.ts +2 -2
- package/src/resource/contract.ts +38 -0
- package/src/resource/files.ts +19 -0
- package/src/resource/kit.ts +109 -0
- package/src/resource/names.ts +13 -0
- package/src/resource/persistence.ts +67 -0
- package/src/resource/registration.ts +48 -0
- package/src/runProcess.ts +11 -5
- package/src/starterPatch.ts +18 -6
- package/src/template.ts +18 -3
- package/src/updateApp.ts +29 -15
- package/src/updateChecks.ts +6 -3
- package/template.json +1 -1
package/dist/template.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.js","sourceRoot":"","sources":["../src/template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAErG,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;AAExF,MAAM,UAAU,WAAW,CAAC,QAAkB,EAAE,OAAO,GAAG,KAAK;IAC9D,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;IAChF,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,KAAK;SACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../src/template.ts"],"names":[],"mappings":"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"}
|
package/dist/updateApp.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Effect, FileSystem, Schema } from "effect";
|
|
2
|
-
import { CreateAppError } from "
|
|
2
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
3
3
|
export declare const updateApp: (folder: string, templatePath: string, version: string) => Effect.Effect<undefined, CreateAppError | import("effect/PlatformError").PlatformError | Schema.SchemaError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | FileSystem.FileSystem>;
|
|
4
4
|
//# sourceMappingURL=updateApp.d.ts.map
|
package/dist/updateApp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateApp.d.ts","sourceRoot":"","sources":["../src/updateApp.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"updateApp.d.ts","sourceRoot":"","sources":["../src/updateApp.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA+BpD,eAAO,MAAM,SAAS,mQAwCpB,CAAC"}
|
package/dist/updateApp.js
CHANGED
|
@@ -1,21 +1,26 @@
|
|
|
1
1
|
import { join, relative, resolve } from "node:path";
|
|
2
2
|
import { Console, Effect, FileSystem, Schema } from "effect";
|
|
3
|
-
import { CreateAppError } from "
|
|
4
|
-
import { GENERATION_FILE, Generation, readTemplate, writeGeneration } from "
|
|
5
|
-
import { historicalTemplate } from "
|
|
6
|
-
import { checkedProcess, runProcess } from "
|
|
7
|
-
import { starterPatch } from "
|
|
8
|
-
import { appTemplate } from "
|
|
9
|
-
import { updateChecks } from "
|
|
10
|
-
const applyPatch = Effect.fn("CreateApp.applyPatch")(function* (target, repository,
|
|
3
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
4
|
+
import { GENERATION_FILE, Generation, readTemplate, writeGeneration } from "#generation.ts";
|
|
5
|
+
import { historicalTemplate } from "#historicalTemplate.ts";
|
|
6
|
+
import { checkedProcess, runProcess } from "#runProcess.ts";
|
|
7
|
+
import { starterPatch } from "#starterPatch.ts";
|
|
8
|
+
import { appTemplate } from "#template.ts";
|
|
9
|
+
import { updateChecks } from "#updateChecks.ts";
|
|
10
|
+
const applyPatch = Effect.fn("CreateApp.applyPatch")(function* (target, repository, patch) {
|
|
11
11
|
const prefix = relative(repository, target);
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
if (!patch.empty) {
|
|
13
|
+
const result = yield* runProcess(repository, "git", ["apply", "--3way", ...(prefix ? [`--directory=${prefix}`] : []), patch.path]);
|
|
14
|
+
if (result.code !== 0) {
|
|
15
|
+
const conflicts = (yield* checkedProcess(target, "git", ["diff", "--name-only", "--diff-filter=U", "--", "."])).trim();
|
|
16
|
+
if (!conflicts) {
|
|
17
|
+
return yield* new CreateAppError({ message: result.stderr.trim() });
|
|
18
|
+
}
|
|
17
19
|
}
|
|
18
20
|
}
|
|
21
|
+
if (patch.conflicts.length > 0) {
|
|
22
|
+
yield* checkedProcess(repository, "git", ["update-index", "-z", "--index-info"], patch.conflicts.map((conflict) => conflict.indexInfo).join(""));
|
|
23
|
+
}
|
|
19
24
|
if ((yield* checkedProcess(target, "git", ["diff", "--cached", "--name-only", "--", "."])).trim() === "") {
|
|
20
25
|
return yield* new CreateAppError({ message: "The starter delta applied no changes. The generation record is unchanged." });
|
|
21
26
|
}
|
|
@@ -33,11 +38,14 @@ export const updateApp = Effect.fn("CreateApp.updateApp")(function* (folder, tem
|
|
|
33
38
|
const current = yield* readTemplate(templatePath);
|
|
34
39
|
const previous = generation.version === version ? current : yield* historicalTemplate(directory, generation.version);
|
|
35
40
|
const patch = yield* starterPatch(target, directory, generation.name, appTemplate(previous, generation.minimal), appTemplate(current, generation.minimal));
|
|
36
|
-
if (!patch.empty) {
|
|
37
|
-
yield* applyPatch(target, repository, patch
|
|
41
|
+
if (!patch.empty || patch.conflicts.length > 0) {
|
|
42
|
+
yield* applyPatch(target, repository, patch);
|
|
38
43
|
}
|
|
39
44
|
yield* writeGeneration(target, { ...generation, version });
|
|
40
45
|
const failures = yield* updateChecks(target);
|
|
46
|
+
if (patch.conflicts.length > 0) {
|
|
47
|
+
failures.push(`Starter deletions conflict with app changes:\n${patch.conflicts.map((conflict) => conflict.path).join("\n")}\nKeep a file with git add -- <path>, or accept its deletion with git rm -- <path>.`);
|
|
48
|
+
}
|
|
41
49
|
if (failures.length > 0) {
|
|
42
50
|
return yield* new CreateAppError({
|
|
43
51
|
message: `Recorded create-app ${version}. Finish the update before committing:\n${failures.join("\n\n")}`,
|
package/dist/updateApp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateApp.js","sourceRoot":"","sources":["../src/updateApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"updateApp.js","sourceRoot":"","sources":["../src/updateApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAC7D,MAAc,EACd,UAAkB,EAClB,KAAsD;IAEtD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACnI,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACvH,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,OAAO,KAAK,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACrE,CAAC;QACF,CAAC;IACF,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,KAAK,CAAC,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAClJ,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1G,OAAO,KAAK,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,2EAA2E,EAAE,CAAC,CAAC;IAC5H,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc,EAAE,YAAoB,EAAE,OAAe;IACzH,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACnG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAChG,OAAO,KAAK,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,8EAA8E,EAAE,CAAC,CAAC;QAC/H,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CACtF,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CACvD,CAAC;QACF,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACtF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QACrH,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,YAAY,CAChC,MAAM,EACN,SAAS,EACT,UAAU,CAAC,IAAI,EACf,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,EACzC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CACxC,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CACZ,iDAAiD,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,qFAAqF,CACjM,CAAC;QACH,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,CAAC,IAAI,cAAc,CAAC;gBAChC,OAAO,EAAE,uBAAuB,OAAO,2CAA2C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;aACzG,CAAC,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,2EAA2E,CAAC,CAAC;IAC9H,CAAC,CAAC,CACF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/dist/updateChecks.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import { CreateAppError } from "
|
|
2
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
3
3
|
export declare const updateChecks: (target: string) => Effect.Effect<string[], CreateAppError | import("effect/PlatformError").PlatformError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner>;
|
|
4
4
|
//# sourceMappingURL=updateChecks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateChecks.d.ts","sourceRoot":"","sources":["../src/updateChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"updateChecks.d.ts","sourceRoot":"","sources":["../src/updateChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAsBpD,eAAO,MAAM,YAAY,8KA0BvB,CAAC"}
|
package/dist/updateChecks.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Console, Effect } from "effect";
|
|
2
|
-
import { CreateAppError } from "
|
|
3
|
-
import { checkedProcess, runProcess } from "
|
|
2
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
3
|
+
import { checkedProcess, runProcess } from "#runProcess.ts";
|
|
4
4
|
const conflictMarkers = Effect.fn("CreateApp.conflictMarkers")(function* (target) {
|
|
5
5
|
const result = yield* runProcess(target, "git", [
|
|
6
6
|
"grep",
|
|
@@ -21,7 +21,10 @@ const conflictMarkers = Effect.fn("CreateApp.conflictMarkers")(function* (target
|
|
|
21
21
|
});
|
|
22
22
|
export const updateChecks = Effect.fn("CreateApp.updateChecks")(function* (target) {
|
|
23
23
|
const failures = [];
|
|
24
|
-
for (const args of [
|
|
24
|
+
for (const args of [
|
|
25
|
+
["install", "--no-frozen-lockfile"],
|
|
26
|
+
["run", "typecheck"],
|
|
27
|
+
]) {
|
|
25
28
|
yield* Console.log(`Running pnpm ${args.join(" ")}...`);
|
|
26
29
|
const result = yield* runProcess(target, "pnpm", args);
|
|
27
30
|
if (result.code !== 0) {
|
package/dist/updateChecks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateChecks.js","sourceRoot":"","sources":["../src/updateChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"updateChecks.js","sourceRoot":"","sources":["../src/updateChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5D,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc;IACvF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE;QAC/C,MAAM;QACN,aAAa;QACb,oBAAoB;QACpB,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,kCAAkC;QAClC,IAAI;QACJ,GAAG;KACH,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,qCAAqC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5G,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc;IACxF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI;QAClB,CAAC,SAAS,EAAE,sBAAsB,CAAC;QACnC,CAAC,KAAK,EAAE,WAAW,CAAC;KACpB,EAAE,CAAC;QACH,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/G,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;gBAC7E,QAAQ,CAAC,IAAI,CACZ,2QAA2Q,CAC3Q,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,QAAQ,CAAC,OAAO,CAAC,iCAAiC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxH,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACvB,QAAQ,CAAC,IAAI,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/create-app",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.0",
|
|
4
4
|
"description": "Create and install a Platform application from the maintained starter",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/create-app#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -44,13 +44,13 @@
|
|
|
44
44
|
"README.md"
|
|
45
45
|
],
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@shivaedev/sql": "0.
|
|
47
|
+
"@shivaedev/sql": "0.34.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@effect/platform-node": "4.0.6",
|
|
51
51
|
"@effect/platform-node-shared": "4.0.6",
|
|
52
|
-
"@shivaedev/quality": "0.
|
|
53
|
-
"@shivaedev/test-story": "0.
|
|
52
|
+
"@shivaedev/quality": "0.57.0",
|
|
53
|
+
"@shivaedev/test-story": "0.35.0",
|
|
54
54
|
"@types/node": "24.19.2",
|
|
55
55
|
"effect": "4.0.6",
|
|
56
56
|
"esbuild": "0.28.2",
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { Console, Effect, FileSystem, Path } from "effect";
|
|
2
|
+
import { MIGRATION_FILE_PATTERN } from "@shivaedev/sql/migrationConvention.ts";
|
|
3
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
4
|
+
import { GENERATION_FILE } from "#generation.ts";
|
|
5
|
+
import { resourceFiles } from "#resource/files.ts";
|
|
6
|
+
import { resourceNames } from "#resource/names.ts";
|
|
7
|
+
|
|
8
|
+
export const addResource = Effect.fn("CreateApp.addResource")(function* (folder: string, name: string) {
|
|
9
|
+
const fs = yield* FileSystem.FileSystem;
|
|
10
|
+
const path = yield* Path.Path;
|
|
11
|
+
const root = path.resolve(folder);
|
|
12
|
+
const names = yield* resourceNames(name);
|
|
13
|
+
if (!(yield* fs.exists(path.join(root, GENERATION_FILE)))) {
|
|
14
|
+
return yield* new CreateAppError({ message: `Run create-app resource from a generated app (${GENERATION_FILE} is missing).` });
|
|
15
|
+
}
|
|
16
|
+
const registry = "src/server/modules.ts";
|
|
17
|
+
const source = yield* fs.readFileString(path.join(root, registry));
|
|
18
|
+
const declaration = /const modules = \[[\s\S]*?\] as const;/gu;
|
|
19
|
+
if ([...source.matchAll(declaration)].length !== 1) {
|
|
20
|
+
return yield* new CreateAppError({ message: `Cannot register ${name}: ${registry} must declare const modules = [...] as const;` });
|
|
21
|
+
}
|
|
22
|
+
const files = yield* fs.readDirectory(path.join(root, "src"), { recursive: true });
|
|
23
|
+
const ids = files
|
|
24
|
+
.filter((file) => path.basename(path.dirname(file)) === "migrations" && MIGRATION_FILE_PATTERN.test(path.basename(file)))
|
|
25
|
+
.map((file) => Number(path.basename(file).slice(0, 4)));
|
|
26
|
+
const migration = String(Math.max(0, ...ids) + 1).padStart(4, "0");
|
|
27
|
+
const generated = resourceFiles(names, migration);
|
|
28
|
+
const existing: string[] = [];
|
|
29
|
+
for (const file of Object.keys(generated)) {
|
|
30
|
+
if (yield* fs.exists(path.join(root, file))) {
|
|
31
|
+
existing.push(file);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (existing.length > 0) {
|
|
35
|
+
return yield* new CreateAppError({ message: `Refusing to overwrite existing files:\n${existing.join("\n")}` });
|
|
36
|
+
}
|
|
37
|
+
for (const [file, content] of Object.entries(generated)) {
|
|
38
|
+
yield* fs.makeDirectory(path.dirname(path.join(root, file)), { recursive: true });
|
|
39
|
+
yield* fs.writeFileString(path.join(root, file), content, { flag: "wx", mode: 0o644 });
|
|
40
|
+
}
|
|
41
|
+
const registration = `${names.camel}Registration`;
|
|
42
|
+
const imported = `import { ${registration} } from "#modules/${name}/server/registration.ts";\n`;
|
|
43
|
+
yield* fs.writeFileString(path.join(root, registry), imported + source.replace("const modules = [", `const modules = [${registration}, `));
|
|
44
|
+
yield* Console.log(`Added ${name}.\n\nNext steps:\n pnpm format\n pnpm migrate\n pnpm test src/modules/${name}/server/lifecycle.spec.ts`);
|
|
45
|
+
});
|
package/src/cli.ts
CHANGED
|
@@ -4,6 +4,7 @@ import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
|
|
|
4
4
|
import * as NodeServices from "@effect/platform-node/NodeServices";
|
|
5
5
|
import { Cause, Console, Effect, FileSystem, Option, Schema } from "effect";
|
|
6
6
|
import { Argument, Command, Flag } from "effect/cli";
|
|
7
|
+
import { addResource } from "./addResource.ts";
|
|
7
8
|
import { CreateAppError } from "./CreateAppError.ts";
|
|
8
9
|
import { createApp } from "./createApp.ts";
|
|
9
10
|
import { updateApp } from "./updateApp.ts";
|
|
@@ -14,6 +15,9 @@ const program = Effect.gen(function* () {
|
|
|
14
15
|
const { version } = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Struct({ version: Schema.String })))(manifest);
|
|
15
16
|
const templatePath = fileURLToPath(new URL("../template.json", import.meta.url));
|
|
16
17
|
const update = Command.make("update", {}, () => updateApp(".", templatePath, version));
|
|
18
|
+
const resource = Command.make("resource", { name: Argument.String("name") }, ({ name }) => addResource(".", name)).pipe(
|
|
19
|
+
Command.withDescription("Add an authenticated resource and register it in this app's server module list."),
|
|
20
|
+
);
|
|
17
21
|
const cli = Command.make(
|
|
18
22
|
"create-app",
|
|
19
23
|
{
|
|
@@ -23,10 +27,13 @@ const program = Effect.gen(function* () {
|
|
|
23
27
|
},
|
|
24
28
|
({ folder, git, minimal }) =>
|
|
25
29
|
Option.match(folder, {
|
|
26
|
-
onNone: () => Effect.fail(new CreateAppError({ message: "Provide an app folder or use create-app update." })),
|
|
30
|
+
onNone: () => Effect.fail(new CreateAppError({ message: "Provide an app folder or use create-app update or resource." })),
|
|
27
31
|
onSome: (destination) => createApp(destination, templatePath, { git, minimal, version }),
|
|
28
32
|
}),
|
|
29
|
-
).pipe(
|
|
33
|
+
).pipe(
|
|
34
|
+
Command.withSubcommands([update, resource]),
|
|
35
|
+
Command.withDescription("Create and install a Platform application from the maintained starter."),
|
|
36
|
+
);
|
|
30
37
|
yield* Command.run(cli, { version });
|
|
31
38
|
});
|
|
32
39
|
|
package/src/packTemplate.ts
CHANGED
|
@@ -10,8 +10,8 @@ const appPaths = new Map([
|
|
|
10
10
|
["app-readme.md", "README.md"],
|
|
11
11
|
["pnpm-workspace.copy.yaml", "pnpm-workspace.yaml"],
|
|
12
12
|
]);
|
|
13
|
-
const excluded = new Set(["node_modules", "dist", "coverage", ".browser-check", "pnpm-lock.yaml", ".git"]);
|
|
14
|
-
const rootExcluded = new Set(["published-versions.json", "AGENTS.md", "CLAUDE.md", "README.md"]);
|
|
13
|
+
const excluded = new Set(["node_modules", "dist", "coverage", "test-results", ".browser-check", "pnpm-lock.yaml", ".git"]);
|
|
14
|
+
const rootExcluded = new Set(["published-versions.json", "AGENTS.md", "CLAUDE.md", "README.md", ".agents", ".claude"]);
|
|
15
15
|
function included(path: string) {
|
|
16
16
|
return !(rootExcluded.has(path) || excluded.has(basename(path))) && (!basename(path).startsWith(".env") || basename(path) === ".env.example");
|
|
17
17
|
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { ResourceNames } from "./names.ts";
|
|
2
|
+
|
|
3
|
+
export function resourceContract({ name, pascal, table }: ResourceNames) {
|
|
4
|
+
return `import { Option, Schema } from "effect";
|
|
5
|
+
import { Model } from "effect/schema";
|
|
6
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
7
|
+
import { contract } from "@shivaedev/contract/contract.ts";
|
|
8
|
+
import { command, query } from "@shivaedev/contract/operation.ts";
|
|
9
|
+
import { signedIn } from "@shivaedev/contract/readPolicy.ts";
|
|
10
|
+
import { fieldRejection } from "@shivaedev/contract/rejection.ts";
|
|
11
|
+
import { InternalServerError, ServiceUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
12
|
+
import { AuthenticatedUser } from "@shivaedev/identity/middleware.ts";
|
|
13
|
+
|
|
14
|
+
export class Item extends Model.Class<Item>("${pascal}Item")({
|
|
15
|
+
id: Model.Field({ json: Schema.Number, select: Schema.Number, update: Schema.Number }),
|
|
16
|
+
title: Schema.Trim.check(Schema.isNonEmpty({ message: "Enter a title" })),
|
|
17
|
+
}) {}
|
|
18
|
+
|
|
19
|
+
export const Fields = Schema.Struct({ title: Item.fields.title });
|
|
20
|
+
export const keys = collection("${table}", Schema.Number, { userId: Schema.String });
|
|
21
|
+
|
|
22
|
+
export const List = query("list", {
|
|
23
|
+
readPolicy: signedIn,
|
|
24
|
+
reads: (_input, viewer) => (Option.isSome(viewer) ? [keys.bucket.userId(viewer.value.id)] : []),
|
|
25
|
+
rejections: { InternalServerError, ServiceUnavailable },
|
|
26
|
+
success: Schema.Array(Item.json),
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
export const Create = command("create", {
|
|
30
|
+
invalidates: () => [],
|
|
31
|
+
payload: Fields,
|
|
32
|
+
rejections: { InternalServerError, Invalid: fieldRejection(Fields), ServiceUnavailable },
|
|
33
|
+
success: Item.json,
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
export const ${pascal}Contract = contract("${name}", { commands: [Create], queries: [List] }).middleware(AuthenticatedUser);
|
|
37
|
+
`;
|
|
38
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { resourceContract } from "./contract.ts";
|
|
2
|
+
import { resourceKit, resourceStory } from "./kit.ts";
|
|
3
|
+
import type { ResourceNames } from "./names.ts";
|
|
4
|
+
import { resourceMigration, resourceRepository, resourceService } from "./persistence.ts";
|
|
5
|
+
import { resourceClient, resourceRegistration } from "./registration.ts";
|
|
6
|
+
|
|
7
|
+
export function resourceFiles(names: ResourceNames, migration: string) {
|
|
8
|
+
const root = `src/modules/${names.name}`;
|
|
9
|
+
return {
|
|
10
|
+
[`${root}/${names.name}.ts`]: resourceContract(names),
|
|
11
|
+
[`${root}/client/make.ts`]: resourceClient(names),
|
|
12
|
+
[`${root}/server/makeRepository.ts`]: resourceRepository(names),
|
|
13
|
+
[`${root}/server/migrations/${migration}_${names.table}.ts`]: resourceMigration(names),
|
|
14
|
+
[`${root}/server/registration.ts`]: resourceRegistration(names),
|
|
15
|
+
[`${root}/server/Service.ts`]: resourceService(names),
|
|
16
|
+
[`${root}/server/lifecycle.spec.ts`]: resourceStory(names),
|
|
17
|
+
[`${root}/test-support/application.ts`]: resourceKit(names),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import type { ResourceNames } from "./names.ts";
|
|
2
|
+
|
|
3
|
+
export function resourceKit({ name, pascal, table }: ResourceNames) {
|
|
4
|
+
return `import { layerWebSocketConstructorWS } from "@effect/platform-node/NodeSocket";
|
|
5
|
+
import { Effect } from "effect";
|
|
6
|
+
import { SqlClient } from "effect/sql";
|
|
7
|
+
import { withIsolatedDatabase } from "@shivaedev/test-sql/server/withIsolatedDatabase.ts";
|
|
8
|
+
import { storyKit } from "@shivaedev/test-story/server/storyKit.ts";
|
|
9
|
+
import { make${pascal}Client } from "#modules/${name}/client/make.ts";
|
|
10
|
+
import { startHost } from "#test-support/host.ts";
|
|
11
|
+
import { postgres } from "#test-support/postgres.ts";
|
|
12
|
+
import { mintUser } from "#test-support/sessionPrecondition.ts";
|
|
13
|
+
|
|
14
|
+
type Client = Effect.Success<ReturnType<typeof make${pascal}Client>["client"]>;
|
|
15
|
+
|
|
16
|
+
export const app = storyKit({
|
|
17
|
+
around: withIsolatedDatabase,
|
|
18
|
+
clock: "live",
|
|
19
|
+
*create() {
|
|
20
|
+
const host = yield* startHost();
|
|
21
|
+
return { accounts: new Map<string, Client>(), host };
|
|
22
|
+
},
|
|
23
|
+
inspect: (engine) => ({ accounts: [...engine.accounts.keys()], baseUrl: engine.host.baseUrl }),
|
|
24
|
+
layer: postgres,
|
|
25
|
+
name: "${name}",
|
|
26
|
+
stages: ["accounts", "items"],
|
|
27
|
+
verbs: (engine, story) => ({
|
|
28
|
+
itemsOf: (name: string) => {
|
|
29
|
+
const client = engine.accounts.get(name);
|
|
30
|
+
if (client === undefined) {
|
|
31
|
+
throw new Error(\`Give the story signedIn("\${name}")\`);
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
create: (title: string) => {
|
|
35
|
+
story.tell(\`\${name} creates \${JSON.stringify(title)}\`);
|
|
36
|
+
return client["${name}.create"]({ title });
|
|
37
|
+
},
|
|
38
|
+
list: () => {
|
|
39
|
+
story.tell(\`\${name} lists ${name}\`);
|
|
40
|
+
return client["${name}.list"]();
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
},
|
|
44
|
+
storedTitles: () =>
|
|
45
|
+
Effect.gen(function* () {
|
|
46
|
+
const sql = yield* SqlClient.SqlClient;
|
|
47
|
+
const rows = yield* sql<{ title: string }>\`select title from \${sql("${table}")} order by id desc\`;
|
|
48
|
+
return rows.map((row) => row.title);
|
|
49
|
+
}),
|
|
50
|
+
visitorClient: () => make${pascal}Client(\`\${engine.host.baseUrl}/rpc\`, { webSocketConstructor: layerWebSocketConstructorWS }).client,
|
|
51
|
+
}),
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
export function signedIn(name: string) {
|
|
55
|
+
return app.trait("accounts", \`\${name} is signed in\`, function* (engine) {
|
|
56
|
+
const { headers } = yield* mintUser(engine.host, name);
|
|
57
|
+
const client = yield* make${pascal}Client(\`\${engine.host.baseUrl}/rpc\`, {
|
|
58
|
+
headers: { cookie: headers.get("cookie") ?? "", origin: engine.host.origin },
|
|
59
|
+
webSocketConstructor: layerWebSocketConstructorWS,
|
|
60
|
+
}).client;
|
|
61
|
+
engine.accounts.set(name, client);
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
`;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export function resourceStory({ name }: ResourceNames) {
|
|
68
|
+
return `import { expect } from "vitest";
|
|
69
|
+
import { outcomes } from "@shivaedev/test-story/server/outcomes.ts";
|
|
70
|
+
import { app, signedIn } from "#modules/${name}/test-support/application.ts";
|
|
71
|
+
import { answer } from "#test-support/answers.ts";
|
|
72
|
+
|
|
73
|
+
app.it("alice creates an item, lists it and persists it in PostgreSQL", [signedIn("alice")], function* ({ itemsOf, storedTitles }) {
|
|
74
|
+
expect(yield* itemsOf("alice").list()).toEqual([]);
|
|
75
|
+
|
|
76
|
+
const item = yield* itemsOf("alice").create("First item");
|
|
77
|
+
|
|
78
|
+
expect(item.title).toBe("First item");
|
|
79
|
+
yield* outcomes([
|
|
80
|
+
["alice's list", () => itemsOf("alice").list(), [{ id: item.id, title: "First item" }]],
|
|
81
|
+
["stored titles", () => storedTitles(), ["First item"]],
|
|
82
|
+
]);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
app.it("bob cannot list alice's items", [signedIn("alice"), signedIn("bob")], function* ({ itemsOf }) {
|
|
86
|
+
yield* itemsOf("alice").create("Alice's private item");
|
|
87
|
+
|
|
88
|
+
const listed = yield* itemsOf("bob").list();
|
|
89
|
+
|
|
90
|
+
expect(listed).toEqual([]);
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
app.it("a visitor cannot create items", [], function* ({ visitorClient }) {
|
|
94
|
+
const client = yield* visitorClient();
|
|
95
|
+
|
|
96
|
+
const replied = yield* answer(client["${name}.create"]({ title: "Anonymous item" }));
|
|
97
|
+
|
|
98
|
+
expect(replied).toBe("sign in required");
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
app.it("a visitor cannot list items", [], function* ({ visitorClient }) {
|
|
102
|
+
const client = yield* visitorClient();
|
|
103
|
+
|
|
104
|
+
const replied = yield* answer(client["${name}.list"]());
|
|
105
|
+
|
|
106
|
+
expect(replied).toBe("sign in required");
|
|
107
|
+
});
|
|
108
|
+
`;
|
|
109
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
3
|
+
|
|
4
|
+
export const resourceNames = Effect.fn("CreateApp.resourceNames")(function* (name: string) {
|
|
5
|
+
if (!/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/u.test(name) || name.length > 63) {
|
|
6
|
+
return yield* new CreateAppError({ message: "Use a lowercase resource name with optional hyphens, at most 63 characters long." });
|
|
7
|
+
}
|
|
8
|
+
const words = name.split("-");
|
|
9
|
+
const pascal = words.map((word) => word[0]?.toUpperCase() + word.slice(1)).join("");
|
|
10
|
+
return { camel: pascal[0]?.toLowerCase() + pascal.slice(1), name, pascal, table: words.join("_") };
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
export type ResourceNames = Effect.Success<ReturnType<typeof resourceNames>>;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import type { ResourceNames } from "./names.ts";
|
|
2
|
+
|
|
3
|
+
export function resourceRepository({ name, pascal, table }: ResourceNames) {
|
|
4
|
+
return `import { Schema } from "effect";
|
|
5
|
+
import { Model } from "effect/schema";
|
|
6
|
+
import { bucket } from "@shivaedev/changes/buckets.ts";
|
|
7
|
+
import { makeRepository } from "@shivaedev/sql/repository.ts";
|
|
8
|
+
import { Item, keys } from "#modules/${name}/${name}.ts";
|
|
9
|
+
|
|
10
|
+
export class StoredItem extends Model.Class<StoredItem>("Stored${pascal}Item")({
|
|
11
|
+
...Model.fields(Item),
|
|
12
|
+
userId: bucket(Schema.String),
|
|
13
|
+
}) {}
|
|
14
|
+
|
|
15
|
+
export const make${pascal}Repository = makeRepository(StoredItem, {
|
|
16
|
+
collection: keys,
|
|
17
|
+
idColumn: "id",
|
|
18
|
+
spanPrefix: "${pascal}",
|
|
19
|
+
tableName: "${table}",
|
|
20
|
+
});
|
|
21
|
+
`;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function resourceService({ name, pascal }: ResourceNames) {
|
|
25
|
+
return `import { Effect } from "effect";
|
|
26
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
27
|
+
import { SqlClient } from "effect/sql";
|
|
28
|
+
import type { SqlError } from "effect/sql/SqlError";
|
|
29
|
+
import { ServiceUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
30
|
+
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
31
|
+
import { transact } from "@shivaedev/sql/transact.ts";
|
|
32
|
+
import type { Create } from "#modules/${name}/${name}.ts";
|
|
33
|
+
import { make${pascal}Repository } from "./makeRepository.ts";
|
|
34
|
+
|
|
35
|
+
const unavailable = (cause: SqlError) => Object.assign(new ServiceUnavailable({ message: "Could not reach the ${name} database" }), { cause });
|
|
36
|
+
|
|
37
|
+
export const ${pascal}Service = defineService({
|
|
38
|
+
id: "app/${pascal}Service",
|
|
39
|
+
initialize: make${pascal}Repository,
|
|
40
|
+
methods: (repository) => ({
|
|
41
|
+
create: (input: typeof Create.payload.Type, userId: string) =>
|
|
42
|
+
repository.insert({ ...input, userId }).pipe(transact({ onSqlError: unavailable })),
|
|
43
|
+
list: (userId: string) =>
|
|
44
|
+
repository
|
|
45
|
+
.findMany({ orderBy: { direction: "desc", field: "id" }, select: ["id", "title"], where: { userId } })
|
|
46
|
+
.pipe(Effect.catchTag("SqlError", (cause) => Effect.fail(unavailable(cause)))),
|
|
47
|
+
}),
|
|
48
|
+
requires: [SqlClient.SqlClient, Reactivity.Reactivity],
|
|
49
|
+
});
|
|
50
|
+
`;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export function resourceMigration({ table }: ResourceNames) {
|
|
54
|
+
return `import { Effect } from "effect";
|
|
55
|
+
import { SqlClient } from "effect/sql";
|
|
56
|
+
import { userReference } from "@shivaedev/identity/server/better-auth/userReference.ts";
|
|
57
|
+
|
|
58
|
+
export default Effect.gen(function* () {
|
|
59
|
+
const sql = yield* SqlClient.SqlClient;
|
|
60
|
+
yield* sql\`create table \${sql("${table}")} (
|
|
61
|
+
id serial primary key,
|
|
62
|
+
title text not null,
|
|
63
|
+
user_id text not null references \${sql(userReference.table)} (\${sql(userReference.column)}) on delete cascade
|
|
64
|
+
)\`;
|
|
65
|
+
});
|
|
66
|
+
`;
|
|
67
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import type { ResourceNames } from "./names.ts";
|
|
2
|
+
|
|
3
|
+
export function resourceRegistration({ name, camel, pascal }: ResourceNames) {
|
|
4
|
+
return `import { resolve } from "node:path";
|
|
5
|
+
import * as NodeServices from "@effect/platform-node/NodeServices";
|
|
6
|
+
import { Effect } from "effect";
|
|
7
|
+
import { Migrator } from "effect/sql";
|
|
8
|
+
import { rpcBoundary } from "@shivaedev/errors/boundary.ts";
|
|
9
|
+
import { InternalServerError } from "@shivaedev/errors/taxonomy.ts";
|
|
10
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
11
|
+
import type { AppModule } from "@shivaedev/server/AppModule.ts";
|
|
12
|
+
import { Create, List, ${pascal}Contract } from "#modules/${name}/${name}.ts";
|
|
13
|
+
import { ${pascal}Service } from "./Service.ts";
|
|
14
|
+
|
|
15
|
+
const boundaryOptions = { unexpected: (message: string) => new InternalServerError({ message }) };
|
|
16
|
+
|
|
17
|
+
const handlers = ${pascal}Contract.application.toLayer(
|
|
18
|
+
Effect.gen(function* () {
|
|
19
|
+
const service = yield* ${pascal}Service;
|
|
20
|
+
return ${pascal}Contract.application.of({
|
|
21
|
+
"${name}.create": (input) =>
|
|
22
|
+
Effect.flatMap(SessionUser, ({ id }) => service.create(input, id).pipe(rpcBoundary(Create.error, boundaryOptions))),
|
|
23
|
+
"${name}.list": () => Effect.flatMap(SessionUser, ({ id }) => service.list(id).pipe(rpcBoundary(List.error, boundaryOptions))),
|
|
24
|
+
});
|
|
25
|
+
}),
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
export const ${camel}Registration = {
|
|
29
|
+
group: ${pascal}Contract,
|
|
30
|
+
handlers,
|
|
31
|
+
migrations: { loader: Migrator.fromFileSystem(resolve(import.meta.dirname, "migrations")).pipe(Effect.provide(NodeServices.layer)) },
|
|
32
|
+
name: "${name}",
|
|
33
|
+
services: ${pascal}Service.layer,
|
|
34
|
+
} satisfies AppModule;
|
|
35
|
+
`;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function resourceClient({ name, pascal }: ResourceNames) {
|
|
39
|
+
return `import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
40
|
+
import { makeClient } from "@shivaedev/contract/bind.ts";
|
|
41
|
+
import type { ClientOptions } from "@shivaedev/contract/clientOptions.ts";
|
|
42
|
+
import { ${pascal}Contract } from "#modules/${name}/${name}.ts";
|
|
43
|
+
|
|
44
|
+
export function make${pascal}Client(url: string, options: Omit<ClientOptions, "url"> & { readonly registry?: AtomRegistry.AtomRegistry } = {}) {
|
|
45
|
+
return makeClient(${pascal}Contract, { url, ...options });
|
|
46
|
+
}
|
|
47
|
+
`;
|
|
48
|
+
}
|
package/src/runProcess.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { Effect, Stream } from "effect";
|
|
2
2
|
import { ChildProcess, ChildProcessSpawner } from "effect/process";
|
|
3
|
-
import { CreateAppError } from "
|
|
3
|
+
import { CreateAppError } from "#CreateAppError.ts";
|
|
4
4
|
|
|
5
|
-
export const runProcess = Effect.fn("CreateApp.runProcess")(function* (cwd: string, command: string, args: readonly string[]) {
|
|
5
|
+
export const runProcess = Effect.fn("CreateApp.runProcess")(function* (cwd: string, command: string, args: readonly string[], input?: string) {
|
|
6
6
|
return yield* Effect.scoped(
|
|
7
7
|
Effect.gen(function* () {
|
|
8
8
|
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
|
|
9
|
-
const
|
|
9
|
+
const stdin = input === undefined ? "ignore" : Stream.make(new TextEncoder().encode(input));
|
|
10
|
+
const child = yield* spawner.spawn(ChildProcess.make(command, args, { cwd, stdin }));
|
|
10
11
|
const [stdout, stderr, code] = yield* Effect.all(
|
|
11
12
|
[Stream.mkString(Stream.decodeText(child.stdout)), Stream.mkString(Stream.decodeText(child.stderr)), child.exitCode],
|
|
12
13
|
{ concurrency: "unbounded" },
|
|
@@ -16,8 +17,13 @@ export const runProcess = Effect.fn("CreateApp.runProcess")(function* (cwd: stri
|
|
|
16
17
|
);
|
|
17
18
|
});
|
|
18
19
|
|
|
19
|
-
export const checkedProcess = Effect.fn("CreateApp.checkedProcess")(function* (
|
|
20
|
-
|
|
20
|
+
export const checkedProcess = Effect.fn("CreateApp.checkedProcess")(function* (
|
|
21
|
+
cwd: string,
|
|
22
|
+
command: string,
|
|
23
|
+
args: readonly string[],
|
|
24
|
+
input?: string,
|
|
25
|
+
) {
|
|
26
|
+
const result = yield* runProcess(cwd, command, args, input);
|
|
21
27
|
if (result.code !== 0) {
|
|
22
28
|
return yield* new CreateAppError({ message: `${command} ${args[0]} failed: ${result.stderr.trim()}` });
|
|
23
29
|
}
|