@nordcraft/ssr 1.0.58 → 1.0.60

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.
@@ -1,15 +1,17 @@
1
1
  import type { Component } from '@nordcraft/core/dist/component/component.types';
2
2
  import type { PluginFormula } from '@nordcraft/core/dist/formula/formulaTypes';
3
- import type { PluginAction } from '@nordcraft/core/dist/types';
3
+ import type { PluginAction, PluginActionV2 } from '@nordcraft/core/dist/types';
4
4
  import type { ProjectFiles, ToddleProject } from '../ssr.types';
5
5
  export declare function takeReferencedFormulasAndActions({ component, files, }: {
6
6
  component: Component | undefined;
7
7
  files: ProjectFiles;
8
8
  }): {
9
9
  __PROJECT__: {
10
- actions: Record<string, PluginAction & {
10
+ actions: Record<string, (PluginAction & {
11
11
  packageName?: string;
12
- }>;
12
+ }) | (PluginActionV2 & {
13
+ packageName?: string;
14
+ })>;
13
15
  formulas: Record<string, PluginFormula<string> & {
14
16
  packageName?: string;
15
17
  }>;
@@ -1,3 +1,4 @@
1
+ import { isLegacyPluginAction } from '@nordcraft/core/dist/component/actionUtils';
1
2
  import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent';
2
3
  import { isToddleFormula } from '@nordcraft/core/dist/formula/formula';
3
4
  import { filterObject, mapObject } from '@nordcraft/core/dist/utils/collections';
@@ -83,7 +84,7 @@ export const hasCustomCode = (component, files) => {
83
84
  return Object.values(code).some((c) => Object.keys(c.actions).length > 0 || Object.keys(c.formulas).length > 0);
84
85
  };
85
86
  export const generateCustomCodeFile = ({ code, componentName, projectId, }) => {
86
- const v2ActionCode = mapObject(filterObject(code, ([_, c]) => Object.values(c.actions).some((a) => a.version === 2)), ([packageName, c]) => [
87
+ const v2ActionCode = mapObject(filterObject(code, ([_, c]) => Object.values(c.actions).some((a) => !isLegacyPluginAction(a))), ([packageName, c]) => [
87
88
  // A small hack to group project actions/formulas under the project short id
88
89
  // TS doesn't let us index an object by a generic, hence this hack
89
90
  packageName === '__PROJECT__' ? projectId : packageName,
@@ -112,7 +113,7 @@ export const loadCustomCode = () => {
112
113
  // We assume that packages don't have legacy actions/formulas
113
114
  // Therefore we only load code from the actual project
114
115
  Object.values(code.__PROJECT__.actions)
115
- .filter((a) => typeof a.name === 'string' && a.version === undefined)
116
+ .filter((a) => typeof a.name === 'string' && isLegacyPluginAction(a))
116
117
  .map((action) => action.handler)
117
118
  .join('\n')}
118
119
  ${Object.values(code.__PROJECT__.formulas)
@@ -127,7 +128,7 @@ export const actions = {
127
128
  ${Object.entries(v2ActionCode)
128
129
  .map(([packageName, { actions }]) => `"${packageName}": {
129
130
  ${Object.values(actions)
130
- .filter((a) => a.version === 2)
131
+ .filter((a) => !isLegacyPluginAction(a))
131
132
  .map((a) => `"${a.name}": {
132
133
  arguments: ${JSON.stringify(a.arguments)},
133
134
  handler: (args, ctx) => {
@@ -1 +1 @@
1
- {"version":3,"file":"codeRefs.js","sourceRoot":"","sources":["../../src/custom-code/codeRefs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codeRefs.js","sourceRoot":"","sources":["../../src/custom-code/codeRefs.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -16,11 +16,11 @@
16
16
  "main": "dist/index.js",
17
17
  "types": "dist/index.d.ts",
18
18
  "dependencies": {
19
- "@nordcraft/core": "1.0.58",
20
- "@nordcraft/std-lib": "1.0.58",
19
+ "@nordcraft/core": "1.0.60",
20
+ "@nordcraft/std-lib": "1.0.60",
21
21
  "fast-deep-equal": "3.1.3",
22
22
  "cookie": "1.0.2",
23
23
  "xss": "1.0.15"
24
24
  },
25
- "version": "1.0.58"
25
+ "version": "1.0.60"
26
26
  }
@@ -1,11 +1,12 @@
1
- import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent'
1
+ import { isLegacyPluginAction } from '@nordcraft/core/dist/component/actionUtils'
2
2
  import type { Component } from '@nordcraft/core/dist/component/component.types'
3
+ import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent'
3
4
  import { isToddleFormula } from '@nordcraft/core/dist/formula/formula'
4
5
  import type {
5
6
  CodeFormula,
6
7
  PluginFormula,
7
8
  } from '@nordcraft/core/dist/formula/formulaTypes'
8
- import type { PluginAction } from '@nordcraft/core/dist/types'
9
+ import type { PluginAction, PluginActionV2 } from '@nordcraft/core/dist/types'
9
10
  import { filterObject, mapObject } from '@nordcraft/core/dist/utils/collections'
10
11
  import { safeFunctionName } from '@nordcraft/core/dist/utils/handlerUtils'
11
12
  import { isDefined } from '@nordcraft/core/dist/utils/util'
@@ -19,7 +20,11 @@ export function takeReferencedFormulasAndActions({
19
20
  files: ProjectFiles
20
21
  }): {
21
22
  __PROJECT__: {
22
- actions: Record<string, PluginAction & { packageName?: string }>
23
+ actions: Record<
24
+ string,
25
+ | (PluginAction & { packageName?: string })
26
+ | (PluginActionV2 & { packageName?: string })
27
+ >
23
28
  formulas: Record<string, PluginFormula<string> & { packageName?: string }>
24
29
  }
25
30
  [packageName: string]: {
@@ -153,7 +158,7 @@ export const generateCustomCodeFile = ({
153
158
  }) => {
154
159
  const v2ActionCode = mapObject(
155
160
  filterObject(code, ([_, c]) =>
156
- Object.values(c.actions).some((a) => a.version === 2),
161
+ Object.values(c.actions).some((a) => !isLegacyPluginAction(a)),
157
162
  ),
158
163
  ([packageName, c]) => [
159
164
  // A small hack to group project actions/formulas under the project short id
@@ -193,7 +198,7 @@ export const loadCustomCode = () => {
193
198
  // We assume that packages don't have legacy actions/formulas
194
199
  // Therefore we only load code from the actual project
195
200
  Object.values(code.__PROJECT__.actions)
196
- .filter((a) => typeof a.name === 'string' && a.version === undefined)
201
+ .filter((a) => typeof a.name === 'string' && isLegacyPluginAction(a))
197
202
  .map((action) => action.handler)
198
203
  .join('\n')
199
204
  }
@@ -213,7 +218,7 @@ export const actions = {
213
218
  .map(
214
219
  ([packageName, { actions }]) => `"${packageName}": {
215
220
  ${Object.values(actions)
216
- .filter((a) => a.version === 2)
221
+ .filter((a) => !isLegacyPluginAction(a))
217
222
  .map(
218
223
  (a) => `"${a.name}": {
219
224
  arguments: ${JSON.stringify(a.arguments)},