@terreno/rtk 0.0.18 → 0.1.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/constants.js +38 -25
- package/dist/constants.js.map +1 -1
- package/dist/tagGenerator.d.ts.map +1 -1
- package/dist/tagGenerator.js +3 -1
- package/dist/tagGenerator.js.map +1 -1
- package/package.json +3 -2
- package/src/constants.ts +42 -26
- package/src/tagGenerator.ts +3 -1
package/dist/constants.js
CHANGED
|
@@ -32,45 +32,58 @@ if (Constants.expoGoConfig?.debuggerHost?.includes("exp.direct")) {
|
|
|
32
32
|
export let baseUrl;
|
|
33
33
|
export let baseWebsocketsUrl;
|
|
34
34
|
export let baseTasksUrl;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
const isDev = typeof __DEV__ !== "undefined" && __DEV__;
|
|
36
|
+
if (process.env.EXPO_PUBLIC_API_URL) {
|
|
37
|
+
// Explicit override (e.g. .env)
|
|
38
|
+
baseUrl = process.env.EXPO_PUBLIC_API_URL;
|
|
38
39
|
baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
|
|
39
40
|
baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
|
|
40
41
|
console.debug(`Base URL set to apiUrl ${baseUrl} for env ${Constants.expoConfig?.extra?.APP_ENV ?? "unknown"}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`);
|
|
41
42
|
}
|
|
42
|
-
else if (
|
|
43
|
-
//
|
|
44
|
-
baseUrl =
|
|
43
|
+
else if (isDev && Constants.expoConfig?.hostUri) {
|
|
44
|
+
// Dev simulator/device
|
|
45
|
+
baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
|
|
46
|
+
baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
|
|
47
|
+
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
|
|
48
|
+
console.debug(`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
|
|
49
|
+
}
|
|
50
|
+
else if (isDev && Constants.experienceUrl) {
|
|
51
|
+
// Dev web (experienceUrl)
|
|
52
|
+
baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
|
|
53
|
+
baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
|
|
54
|
+
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
|
|
55
|
+
console.debug(`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
|
|
56
|
+
}
|
|
57
|
+
else if (isDev) {
|
|
58
|
+
// Dev web fallback
|
|
59
|
+
baseUrl = `http://localhost:4000`;
|
|
60
|
+
baseWebsocketsUrl = `ws://localhost:4000/`;
|
|
61
|
+
baseTasksUrl = `http://localhost:4000/tasks`;
|
|
62
|
+
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
63
|
+
}
|
|
64
|
+
else if (Constants.expoConfig?.extra?.BASE_URL) {
|
|
65
|
+
// Prod/staging
|
|
66
|
+
baseUrl = Constants.expoConfig?.extra?.BASE_URL;
|
|
45
67
|
baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
|
|
46
68
|
baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
|
|
47
69
|
console.debug(`Base URL set to apiUrl ${baseUrl} for env ${Constants.expoConfig?.extra?.APP_ENV ?? "unknown"}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`);
|
|
48
70
|
}
|
|
49
71
|
else if (Constants.expoConfig?.hostUri) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/tasks`;
|
|
72
|
+
baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
|
|
73
|
+
baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
|
|
74
|
+
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
|
|
54
75
|
console.debug(`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
|
|
55
76
|
}
|
|
56
77
|
else if (Constants.experienceUrl) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/tasks`;
|
|
78
|
+
baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
|
|
79
|
+
baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
|
|
80
|
+
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
|
|
61
81
|
console.debug(`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
|
|
62
82
|
}
|
|
63
|
-
else if (!Constants.expoConfig?.extra?.BASE_URL &&
|
|
64
|
-
!Constants.expoConfig?.hostUri &&
|
|
65
|
-
!Constants.experienceUrl) {
|
|
66
|
-
// For dev web, which doesn't have experienceUrl for some reason?
|
|
67
|
-
baseUrl = `http://localhost:3000`;
|
|
68
|
-
baseWebsocketsUrl = `ws://localhost:3000/`;
|
|
69
|
-
baseTasksUrl = `http://localhost:3000/tasks`;
|
|
70
|
-
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
71
|
-
}
|
|
72
83
|
else {
|
|
73
|
-
|
|
74
|
-
|
|
84
|
+
baseUrl = `http://localhost:4000`;
|
|
85
|
+
baseWebsocketsUrl = `ws://localhost:4000/`;
|
|
86
|
+
baseTasksUrl = `http://localhost:4000/tasks`;
|
|
87
|
+
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
75
88
|
}
|
|
76
89
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAIvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAChD,MAAM,CAAC,MAAM,uBAAuB,GAAG,4BAA4B,CAAC;AAEpE,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,KAAK,MAAM,CAAC;AAC7E,IAAI,UAAU,EAAE,CAAC;IACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAc,EAAQ,EAAE;IACjD,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACzB,CAAC;AACH,CAAC,CAAC;AAEF,iEAAiE;AACjE,4CAA4C;AAC5C,MAAM,gBAAgB,GAAG,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,KAAK,MAAM,CAAC;AAClF,IAAI,gBAAgB,EAAE,CAAC;IACrB,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAC/C,CAAC;AAED,+GAA+G;AAC/G,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAyE,EACzE,GAAG,IAAc,EACX,EAAE;IACR,IACE,OAAO,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,IAAI,gBAAgB,EACpE,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC;AAEF,uFAAuF;AACvF,2FAA2F;AAC3F,IAAI,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;IACjE,OAAO,CAAC,KAAK,CACX,iGAAiG,CAClG,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,IAAI,OAAe,CAAC;AAC3B,MAAM,CAAC,IAAI,iBAAyB,CAAC;AACrC,MAAM,CAAC,IAAI,YAAoB,CAAC;AAEhC,IAAI,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagGenerator.d.ts","sourceRoot":"","sources":["../src/tagGenerator.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,YAAY,GAAI,KAAK,GAAG,EAAE,UAAU,MAAM,EAAE,KAAG,
|
|
1
|
+
{"version":3,"file":"tagGenerator.d.ts","sourceRoot":"","sources":["../src/tagGenerator.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,YAAY,GAAI,KAAK,GAAG,EAAE,UAAU,MAAM,EAAE,KAAG,GA8C3D,CAAC"}
|
package/dist/tagGenerator.js
CHANGED
|
@@ -31,7 +31,9 @@ export const generateTags = (api, tagTypes) => {
|
|
|
31
31
|
if (!endpoint.toLowerCase().includes("byid")) {
|
|
32
32
|
const tag = tagTypes.find((t) =>
|
|
33
33
|
// remove "get" from the endpoint name and "ById" from the endpoint name
|
|
34
|
-
t
|
|
34
|
+
t
|
|
35
|
+
.toLowerCase()
|
|
36
|
+
.includes(cleanEndpointStringToGenerateTag(endpoint)));
|
|
35
37
|
if (tag) {
|
|
36
38
|
tags[endpoint] = { providesTags: providesIdTags(tag) };
|
|
37
39
|
}
|
package/dist/tagGenerator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagGenerator.js","sourceRoot":"","sources":["../src/tagGenerator.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAE3D,gGAAgG;AAChG,oCAAoC;AAEpC,MAAM,cAAc,GAClB,CAAC,IAAY,EAAE,EAAE,CACjB,CAAC,MAAW,EAA4C,EAAE,CACxD,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,EAAC,GAAG,EAAM,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,aAAa,GACjB,CAAC,IAAY,EAAE,EAAE,CACjB,CAAC,MAAW,EAA4C,EAAE;IACxD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,EAAC,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEJ,MAAM,iBAAiB,GACrB,CAAC,IAAY,EAAE,EAAE,CACjB,CAAC,MAAW,EAA4C,EAAE,CACxD,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,EAAC,GAAG,EAAM,EAAE,EAAE,CAAC,CAAC,EAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,gCAAgC,GAAG,CAAC,MAAc,EAAU,EAAE;IAClE,iCAAiC;IACjC,MAAM,QAAQ,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC;IAEtB,+DAA+D;IAC/D,MAAM,aAAa,GAAG,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACjD,MAAM,aAAa,GAAG,GAAG,MAAM,GAAG,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,aAAa,IAAI,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC;IAEpE,qDAAqD;IACrD,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAQ,EAAE,QAAkB,EAAO,EAAE;IAChE,kGAAkG;IAClG,2BAA2B;IAC3B,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,MAAM,IAAI,GAAQ,EAAE,CAAC;IACrB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC1C,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAC,eAAe,EAAE,CAAC,eAAe,EAAE,UAAU,CAAC,EAAC,CAAC;QACpE,CAAC;QACD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,iBAAiB;YACjB,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE;gBACtC,wEAAwE;gBACxE,CAAC,
|
|
1
|
+
{"version":3,"file":"tagGenerator.js","sourceRoot":"","sources":["../src/tagGenerator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"dependencies": {
|
|
3
3
|
"@react-native-async-storage/async-storage": "2.2.0",
|
|
4
4
|
"@reduxjs/toolkit": "^2.11.1",
|
|
5
|
-
"@terreno/ui": "0.0
|
|
5
|
+
"@terreno/ui": "0.1.0",
|
|
6
6
|
"async-mutex": "^0.5.0",
|
|
7
7
|
"axios": "^1.13.2",
|
|
8
8
|
"axios-retry": "^4.5.0",
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"scripts": {
|
|
40
40
|
"compile": "tsc",
|
|
41
|
+
"compile:watch": "tsc -w",
|
|
41
42
|
"dev": "tsc -w",
|
|
42
43
|
"lint": "biome check .",
|
|
43
44
|
"lint:fix": "biome check --write .",
|
|
@@ -45,5 +46,5 @@
|
|
|
45
46
|
"test:ci": "echo 'No tests'"
|
|
46
47
|
},
|
|
47
48
|
"types": "dist/index.d.ts",
|
|
48
|
-
"version": "0.0
|
|
49
|
+
"version": "0.1.0"
|
|
49
50
|
}
|
package/src/constants.ts
CHANGED
|
@@ -49,9 +49,11 @@ export let baseUrl: string;
|
|
|
49
49
|
export let baseWebsocketsUrl: string;
|
|
50
50
|
export let baseTasksUrl: string;
|
|
51
51
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
const isDev = typeof __DEV__ !== "undefined" && __DEV__;
|
|
53
|
+
|
|
54
|
+
if (process.env.EXPO_PUBLIC_API_URL) {
|
|
55
|
+
// Explicit override (e.g. .env)
|
|
56
|
+
baseUrl = process.env.EXPO_PUBLIC_API_URL;
|
|
55
57
|
baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
|
|
56
58
|
baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
|
|
57
59
|
|
|
@@ -60,9 +62,33 @@ if (Constants.expoConfig?.extra?.BASE_URL) {
|
|
|
60
62
|
Constants.expoConfig?.extra?.APP_ENV ?? "unknown"
|
|
61
63
|
}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`
|
|
62
64
|
);
|
|
63
|
-
} else if (
|
|
64
|
-
//
|
|
65
|
-
baseUrl =
|
|
65
|
+
} else if (isDev && Constants.expoConfig?.hostUri) {
|
|
66
|
+
// Dev simulator/device
|
|
67
|
+
baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
|
|
68
|
+
baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
|
|
69
|
+
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
|
|
70
|
+
console.debug(
|
|
71
|
+
`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
|
|
72
|
+
Constants.expoConfig?.hostUri
|
|
73
|
+
);
|
|
74
|
+
} else if (isDev && Constants.experienceUrl) {
|
|
75
|
+
// Dev web (experienceUrl)
|
|
76
|
+
baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
|
|
77
|
+
baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
|
|
78
|
+
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
|
|
79
|
+
console.debug(
|
|
80
|
+
`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
|
|
81
|
+
Constants.expoConfig?.hostUri
|
|
82
|
+
);
|
|
83
|
+
} else if (isDev) {
|
|
84
|
+
// Dev web fallback
|
|
85
|
+
baseUrl = `http://localhost:4000`;
|
|
86
|
+
baseWebsocketsUrl = `ws://localhost:4000/`;
|
|
87
|
+
baseTasksUrl = `http://localhost:4000/tasks`;
|
|
88
|
+
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
89
|
+
} else if (Constants.expoConfig?.extra?.BASE_URL) {
|
|
90
|
+
// Prod/staging
|
|
91
|
+
baseUrl = Constants.expoConfig?.extra?.BASE_URL;
|
|
66
92
|
baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
|
|
67
93
|
baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
|
|
68
94
|
|
|
@@ -72,34 +98,24 @@ if (Constants.expoConfig?.extra?.BASE_URL) {
|
|
|
72
98
|
}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`
|
|
73
99
|
);
|
|
74
100
|
} else if (Constants.expoConfig?.hostUri) {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/tasks`;
|
|
101
|
+
baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
|
|
102
|
+
baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
|
|
103
|
+
baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
|
|
79
104
|
console.debug(
|
|
80
105
|
`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
|
|
81
106
|
Constants.expoConfig?.hostUri
|
|
82
107
|
);
|
|
83
108
|
} else if (Constants.experienceUrl) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/tasks`;
|
|
109
|
+
baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
|
|
110
|
+
baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
|
|
111
|
+
baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
|
|
88
112
|
console.debug(
|
|
89
113
|
`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
|
|
90
114
|
Constants.expoConfig?.hostUri
|
|
91
115
|
);
|
|
92
|
-
} else if (
|
|
93
|
-
!Constants.expoConfig?.extra?.BASE_URL &&
|
|
94
|
-
!Constants.expoConfig?.hostUri &&
|
|
95
|
-
!Constants.experienceUrl
|
|
96
|
-
) {
|
|
97
|
-
// For dev web, which doesn't have experienceUrl for some reason?
|
|
98
|
-
baseUrl = `http://localhost:3000`;
|
|
99
|
-
baseWebsocketsUrl = `ws://localhost:3000/`;
|
|
100
|
-
baseTasksUrl = `http://localhost:3000/tasks`;
|
|
101
|
-
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
102
116
|
} else {
|
|
103
|
-
|
|
104
|
-
|
|
117
|
+
baseUrl = `http://localhost:4000`;
|
|
118
|
+
baseWebsocketsUrl = `ws://localhost:4000/`;
|
|
119
|
+
baseTasksUrl = `http://localhost:4000/tasks`;
|
|
120
|
+
console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
|
|
105
121
|
}
|
package/src/tagGenerator.ts
CHANGED
|
@@ -47,7 +47,9 @@ export const generateTags = (api: any, tagTypes: string[]): any => {
|
|
|
47
47
|
if (!endpoint.toLowerCase().includes("byid")) {
|
|
48
48
|
const tag = tagTypes.find((t: string) =>
|
|
49
49
|
// remove "get" from the endpoint name and "ById" from the endpoint name
|
|
50
|
-
t
|
|
50
|
+
t
|
|
51
|
+
.toLowerCase()
|
|
52
|
+
.includes(cleanEndpointStringToGenerateTag(endpoint))
|
|
51
53
|
);
|
|
52
54
|
if (tag) {
|
|
53
55
|
tags[endpoint] = {providesTags: providesIdTags(tag)};
|