@lightdash/common 3.80.0 → 3.81.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/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/types/contentAsCode/base.d.ts +2 -0
- package/dist/cjs/types/contentAsCode/base.d.ts.map +1 -1
- package/dist/cjs/types/contentAsCode/base.js +34 -8
- package/dist/cjs/types/contentAsCode/base.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/types/contentAsCode/base.d.ts +2 -0
- package/dist/esm/types/contentAsCode/base.d.ts.map +1 -1
- package/dist/esm/types/contentAsCode/base.js +30 -6
- package/dist/esm/types/contentAsCode/base.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/types/contentAsCode/base.d.ts +2 -0
- package/dist/types/types/contentAsCode/base.d.ts.map +1 -1
- package/dist/types/types/contentAsCode/base.js +30 -6
- package/dist/types/types/contentAsCode/base.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { PromotionAction } from '../promotion';
|
|
2
2
|
import type { ContentDraftFieldResolution, ContentDraftStaleness, ContentDraftStalenessDetails } from './draftRebase';
|
|
3
3
|
export declare const DEFAULT_CONTENT_AS_CODE_PATH = "lightdash";
|
|
4
|
+
export declare const normalizeContentAsCodeSourcePath: (raw: string) => string;
|
|
4
5
|
export declare const normalizeContentAsCodePath: (raw: string) => string;
|
|
6
|
+
export declare const resolveContentAsCodeRepoPath: (projectDir: string, sourcePath: string) => string;
|
|
5
7
|
export declare const getContentAsCodeFilePath: (contentPath: string, contentType: 'chart' | 'dashboard', slug: string) => string;
|
|
6
8
|
export declare const CONTENT_AS_CODE_VERSION: 1;
|
|
7
9
|
export declare const CONTENT_AS_CODE_VERSIONS: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/types/contentAsCode/base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EACR,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC/B,MAAM,eAAe,CAAC;AAGvB,eAAO,MAAM,4BAA4B,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/types/contentAsCode/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,42 @@
|
|
|
1
1
|
import { ParameterError } from '../errors';
|
|
2
2
|
import { joinContentAsCodePath } from './fileDiscovery';
|
|
3
3
|
export const DEFAULT_CONTENT_AS_CODE_PATH = 'lightdash';
|
|
4
|
-
//
|
|
5
|
-
|
|
4
|
+
// A file path recorded by an upload, relative to the project dir. It may
|
|
5
|
+
// climb into sibling folders: local dbt packages live beside the project and
|
|
6
|
+
// are symlinked into dbt_packages.
|
|
7
|
+
export const normalizeContentAsCodeSourcePath = (raw) => {
|
|
6
8
|
const value = raw.trim().replace(/\\/g, '/');
|
|
7
9
|
if (value.startsWith('/')) {
|
|
8
|
-
throw new ParameterError('
|
|
10
|
+
throw new ParameterError('Content paths must be relative to the project directory');
|
|
9
11
|
}
|
|
10
|
-
|
|
12
|
+
return value
|
|
11
13
|
.split('/')
|
|
12
|
-
.filter((segment) => segment !== '' && segment !== '.')
|
|
13
|
-
|
|
14
|
+
.filter((segment) => segment !== '' && segment !== '.')
|
|
15
|
+
.join('/');
|
|
16
|
+
};
|
|
17
|
+
// Repo directory for charts/ and dashboards/, relative to the project dir; '' is the project dir itself
|
|
18
|
+
export const normalizeContentAsCodePath = (raw) => {
|
|
19
|
+
const normalized = normalizeContentAsCodeSourcePath(raw);
|
|
20
|
+
if (normalized.split('/').includes('..')) {
|
|
14
21
|
throw new ParameterError('content_as_code.path cannot point outside the project directory');
|
|
15
22
|
}
|
|
23
|
+
return normalized;
|
|
24
|
+
};
|
|
25
|
+
// Where a source path lands in the repo: '..' may reach sibling folders of
|
|
26
|
+
// the project dir but never leave the repo
|
|
27
|
+
export const resolveContentAsCodeRepoPath = (projectDir, sourcePath) => {
|
|
28
|
+
const segments = [];
|
|
29
|
+
for (const segment of joinContentAsCodePath(projectDir, sourcePath).split('/')) {
|
|
30
|
+
if (segment === '..') {
|
|
31
|
+
if (segments.length === 0) {
|
|
32
|
+
throw new ParameterError('Content file path points outside the repository');
|
|
33
|
+
}
|
|
34
|
+
segments.pop();
|
|
35
|
+
}
|
|
36
|
+
else if (segment !== '' && segment !== '.') {
|
|
37
|
+
segments.push(segment);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
16
40
|
return segments.join('/');
|
|
17
41
|
};
|
|
18
42
|
export const getContentAsCodeFilePath = (contentPath, contentType, slug) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/types/contentAsCode/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAO3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CAAC;AAExD,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/types/contentAsCode/base.ts"],"names":[],"mappings":"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"}
|