@dbos-inc/create 1.3.2-preview → 1.3.8-preview
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/dist/init.d.ts.map +1 -1
- package/dist/init.js +49 -2
- package/dist/init.js.map +1 -1
- package/package.json +1 -1
- package/templates/hello/package-lock.json +10 -37
- package/templates/hello/tsconfig.json +2 -1
package/dist/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"AAOA,UAAU,UAAU;IAClB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"AAOA,UAAU,UAAU;IAClB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CACvC;AAID,eAAO,MAAM,IAAI,QACV,MAAM,WACF,MAAM,EAAE,QACX,MAAM,eACW,UAAU,oBA4BlC,CAAA;AAgED,wBAAsB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBA4B/D"}
|
package/dist/init.js
CHANGED
|
@@ -32,6 +32,52 @@ function isValidApplicationName(appName) {
|
|
|
32
32
|
}
|
|
33
33
|
return validator.matches(appName, "^[a-z0-9-_]+$");
|
|
34
34
|
}
|
|
35
|
+
const filesAllowedInEmpty = ['.gitignore', 'readme.md'];
|
|
36
|
+
const pathPrefixesAllowedInEmpty = ['.']; // Directories that start with
|
|
37
|
+
function dirHasStuffInIt(pathName) {
|
|
38
|
+
if (!fs.existsSync(pathName)) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
const files = fs.readdirSync(pathName);
|
|
42
|
+
for (const file of files) {
|
|
43
|
+
const fullPath = path.join(pathName, file);
|
|
44
|
+
const isDirectory = fs.lstatSync(fullPath).isDirectory();
|
|
45
|
+
if (isDirectory && !pathPrefixesAllowedInEmpty.some(prefix => file.startsWith(prefix))) {
|
|
46
|
+
//console.log(`Directory ${pathName} is not sufficiently empty because it contains directory: ${file}`);
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
// If it's not a directory, and not in the list of allowed files, return false
|
|
50
|
+
if (!isDirectory && !filesAllowedInEmpty.includes(file.toLowerCase())) {
|
|
51
|
+
//console.log(`Directory ${pathName} is not sufficiently empty because it contains file: ${file}`);
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
function loadGitignoreFile(filePath) {
|
|
58
|
+
if (!fs.existsSync(filePath))
|
|
59
|
+
return new Set();
|
|
60
|
+
const content = fs.readFileSync(filePath, 'utf8');
|
|
61
|
+
const lines = content.split(/\r?\n/);
|
|
62
|
+
return new Set(lines);
|
|
63
|
+
}
|
|
64
|
+
function mergeGitIgnore(existingGISet, templateGISet) {
|
|
65
|
+
const resultSet = new Set(existingGISet);
|
|
66
|
+
templateGISet.forEach(line => {
|
|
67
|
+
if (!resultSet.has(line)) {
|
|
68
|
+
resultSet.add(line);
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
const joined = Array.from(resultSet).join('\n');
|
|
72
|
+
return joined.replaceAll('\n#', '\n\n#');
|
|
73
|
+
}
|
|
74
|
+
function mergeGitignoreFiles(existingFilePath, templateFilePath, outputFilePath) {
|
|
75
|
+
const existingSet = loadGitignoreFile(existingFilePath);
|
|
76
|
+
const templateSet = loadGitignoreFile(templateFilePath);
|
|
77
|
+
const resultContent = mergeGitIgnore(existingSet, templateSet);
|
|
78
|
+
fs.writeFileSync(outputFilePath, resultContent);
|
|
79
|
+
console.log(`Merged .gitignore files saved to ${outputFilePath}`);
|
|
80
|
+
}
|
|
35
81
|
export async function init(appName, templateName) {
|
|
36
82
|
if (!isValidApplicationName(appName)) {
|
|
37
83
|
throw new Error(`Invalid application name: ${appName}. Application name must be between 3 and 30 characters long and can only contain lowercase letters, numbers, hyphens and underscores. Exiting...`);
|
|
@@ -41,12 +87,13 @@ export async function init(appName, templateName) {
|
|
|
41
87
|
if (!fs.existsSync(templatePath)) {
|
|
42
88
|
throw new Error(`Template does not exist: ${templateName}. Exiting...`);
|
|
43
89
|
}
|
|
44
|
-
if (
|
|
90
|
+
if (dirHasStuffInIt(appName)) {
|
|
45
91
|
throw new Error(`Directory ${appName} already exists, exiting...`);
|
|
46
92
|
}
|
|
47
93
|
const targets = ["**"];
|
|
48
94
|
await copy(templatePath, targets, appName);
|
|
49
|
-
|
|
95
|
+
mergeGitignoreFiles(path.join(appName, '.gitignore'), path.join(appName, 'gitignore.template'), path.join(appName, '.gitignore'));
|
|
96
|
+
fs.rmSync(path.resolve(appName, 'gitignore.template'));
|
|
50
97
|
const packageJsonName = path.resolve(appName, 'package.json');
|
|
51
98
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonName, 'utf-8'));
|
|
52
99
|
packageJson.name = appName;
|
package/dist/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAMpC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../init.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -22,37 +22,8 @@
|
|
|
22
22
|
"typescript": "^5.2.2"
|
|
23
23
|
}
|
|
24
24
|
},
|
|
25
|
-
"../..": {
|
|
26
|
-
"name": "@dbos-inc/create",
|
|
27
|
-
"version": "0.0.0-placeholder",
|
|
28
|
-
"extraneous": true,
|
|
29
|
-
"license": "MIT",
|
|
30
|
-
"dependencies": {
|
|
31
|
-
"axios": "^1.6.7",
|
|
32
|
-
"chalk": "4.1.2",
|
|
33
|
-
"commander": "^12.0.0",
|
|
34
|
-
"fast-glob": "^3.3.2",
|
|
35
|
-
"open": "^10.1.0",
|
|
36
|
-
"prompt-sync": "^4.2.0",
|
|
37
|
-
"update-notifier": "^7.0.0",
|
|
38
|
-
"validator": "^13.11.0",
|
|
39
|
-
"winston": "^3.12.0",
|
|
40
|
-
"winston-transport": "^4.7.0"
|
|
41
|
-
},
|
|
42
|
-
"bin": {
|
|
43
|
-
"create": "dist/cli.js"
|
|
44
|
-
},
|
|
45
|
-
"devDependencies": {
|
|
46
|
-
"@types/node": "^20.6.3",
|
|
47
|
-
"@types/prompt-sync": "^4.2.3",
|
|
48
|
-
"@types/update-notifier": "^6.0.8",
|
|
49
|
-
"@types/validator": "^13.11.9",
|
|
50
|
-
"grunt": "^1.6.1",
|
|
51
|
-
"nerdbank-gitversioning": "^3.6.133",
|
|
52
|
-
"typescript": "^5.3.3"
|
|
53
|
-
}
|
|
54
|
-
},
|
|
55
25
|
"../../../..": {
|
|
26
|
+
"name": "@dbos-inc/dbos-sdk",
|
|
56
27
|
"version": "0.0.0-placeholder",
|
|
57
28
|
"license": "MIT",
|
|
58
29
|
"workspaces": [
|
|
@@ -74,6 +45,7 @@
|
|
|
74
45
|
"axios": "1.6.7",
|
|
75
46
|
"commander": "12.0.0",
|
|
76
47
|
"fast-glob": "3.3.2",
|
|
48
|
+
"kafkajs": "^2.2.4",
|
|
77
49
|
"knex": "3.1.0",
|
|
78
50
|
"koa": "2.15.0",
|
|
79
51
|
"lodash": "4.17.21",
|
|
@@ -88,6 +60,7 @@
|
|
|
88
60
|
"yaml": "2.4.1"
|
|
89
61
|
},
|
|
90
62
|
"bin": {
|
|
63
|
+
"dbos": "dist/src/dbos-runtime/cli.js",
|
|
91
64
|
"dbos-sdk": "dist/src/dbos-runtime/cli.js"
|
|
92
65
|
},
|
|
93
66
|
"devDependencies": {
|
|
@@ -111,7 +84,7 @@
|
|
|
111
84
|
"supertest": "^6.3.4",
|
|
112
85
|
"ts-jest": "^29.1.2",
|
|
113
86
|
"typeorm": "^0.3.17",
|
|
114
|
-
"typescript": "
|
|
87
|
+
"typescript": "5.3.3"
|
|
115
88
|
},
|
|
116
89
|
"optionalDependencies": {
|
|
117
90
|
"foundationdb": "^2.0.1"
|
|
@@ -1488,9 +1461,9 @@
|
|
|
1488
1461
|
"dev": true
|
|
1489
1462
|
},
|
|
1490
1463
|
"node_modules/@types/superagent": {
|
|
1491
|
-
"version": "8.1.
|
|
1492
|
-
"resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-8.1.
|
|
1493
|
-
"integrity": "sha512-
|
|
1464
|
+
"version": "8.1.6",
|
|
1465
|
+
"resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-8.1.6.tgz",
|
|
1466
|
+
"integrity": "sha512-yzBOv+6meEHSzV2NThYYOA6RtqvPr3Hbob9ZLp3i07SH27CrYVfm8CrF7ydTmidtelsFiKx2I4gZAiAOamGgvQ==",
|
|
1494
1467
|
"dev": true,
|
|
1495
1468
|
"dependencies": {
|
|
1496
1469
|
"@types/cookiejar": "^2.1.5",
|
|
@@ -2410,9 +2383,9 @@
|
|
|
2410
2383
|
}
|
|
2411
2384
|
},
|
|
2412
2385
|
"node_modules/electron-to-chromium": {
|
|
2413
|
-
"version": "1.4.
|
|
2414
|
-
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.
|
|
2415
|
-
"integrity": "sha512-
|
|
2386
|
+
"version": "1.4.719",
|
|
2387
|
+
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.719.tgz",
|
|
2388
|
+
"integrity": "sha512-FbWy2Q2YgdFzkFUW/W5jBjE9dj+804+98E4Pup78JBPnbdb3pv6IneY2JCPKdeKLh3AOKHQeYf+KwLr7mxGh6Q==",
|
|
2416
2389
|
"dev": true
|
|
2417
2390
|
},
|
|
2418
2391
|
"node_modules/emittery": {
|